[Reproducible-commits] [dpkg] 10/32: Revert "libcompat: Define gettext context functions when NLS is disabled"

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to annotated tag 1.15.10
in repository dpkg.

commit 5fb8497464344c85295cf61d827e5f6de24f1c59
Author: Guillem Jover <guillem at debian.org>
Date:   Sun Apr 17 06:58:35 2011 +0200

    Revert "libcompat: Define gettext context functions when NLS is disabled"
    
    This reverts commit ba4c4690a2bde7b76595a5f48cfdc08dc18ab998.
    
    The 1.15.x series do not use gettext context functions.
    
    Conflicts:
    
    	debian/changelog
---
 debian/changelog     | 1 -
 lib/compat/gettext.h | 8 --------
 2 files changed, 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 21371f0..0f870fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,6 @@
 dpkg (1.15.8.11) UNRELEASED; urgency=low
 
   [ Guillem Jover ]
-  * Fix build failure when passing --disable-nls to configure.
   * Do not segfault on “dpkg -i --no-act”.
   * Add missing semicolon to the vsnprintf() compat declaration.
     Thanks to Robert Millan. Closes: #612203
diff --git a/lib/compat/gettext.h b/lib/compat/gettext.h
index 281e933..a2e93b2 100644
--- a/lib/compat/gettext.h
+++ b/lib/compat/gettext.h
@@ -96,8 +96,6 @@
 /* The separator between msgctxt and msgid in a .mo file.  */
 #define GETTEXT_CONTEXT_GLUE "\004"
 
-#if ENABLE_NLS
-
 /* Pseudo function calls, taking a MSGCTXT and a MSGID instead of just a
    MSGID.  MSGCTXT and MSGID must be string literals.  MSGCTXT should be
    short and rarely need to change.
@@ -270,10 +268,4 @@ dcnpgettext_expr (const char *domain,
   return (n == 1 ? msgid : msgid_plural);
 }
 
-#else /* ENABLE_NLS */
-
-#define pgettext(Msgctxt, Msgid) ((void) (Msgctxt), gettext (Msgid))
-
-#endif /* ENABLE_NLS */
-
 #endif /* _LIBGETTEXT_H */

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git