[Reproducible-commits] [dpkg] 24/105: libdpkg: Move gettext.h header inclusions outside extern blocks

[Niko Tyni]

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

ntyni pushed a commit to branch ntyni/reproducible_builds
in repository dpkg.

commit ecd4baa091619cbbdd70043129dd992573580371
Author: Guillem Jover <guillem at debian.org>
Date:   Sun Mar 27 17:49:35 2016 +0200

    libdpkg: Move gettext.h header inclusions outside extern blocks
    
    Our local <gettext.h> includes <cstdlib> when included from C++ code,
    and this was being done inside an extern "C" block.
    
    Reported-by: Kai Kang <kai.kang at windriver.com>
---
 lib/dpkg/i18n.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/dpkg/i18n.h b/lib/dpkg/i18n.h
index 45d1961..e92158f 100644
--- a/lib/dpkg/i18n.h
+++ b/lib/dpkg/i18n.h
@@ -23,6 +23,12 @@
 
 #include <dpkg/macros.h>
 
+#include <gettext.h>
+
+/* We need to include this because pgettext() uses LC_MESSAGES, but libintl.h
+ * which gets pulled by gettext.h only includes it if building optimized. */
+#include <locale.h>
+
 DPKG_BEGIN_DECLS
 
 /**
@@ -31,12 +37,6 @@ DPKG_BEGIN_DECLS
  * @{
  */
 
-#include <gettext.h>
-
-/* We need to include this because pgettext() uses LC_MESSAGES, but libintl.h
- * which gets pulled by gettext.h only includes it if building optimized. */
-#include <locale.h>
-
 #define _(str) gettext(str)
 #define P_(str, str_plural, n) ngettext(str, str_plural, n)
 #define N_(str) gettext_noop(str)

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