From: Bruno Haible <bruno@clisp.org>
Date: Sat, 23 Dec 2006 18:10:17 +0000 (+0000)
Subject: Use <stdint.h> from gnulib instead of defining uint16_t ourselves.
X-Git-Tag: v0.17~526
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b22b5b3c199814328843bfbe78404292152a1d85;p=thirdparty%2Fgettext.git

Use <stdint.h> from gnulib instead of defining uint16_t ourselves.
Fixes a macro redefinition warning on cygwin.
---

diff --git a/ChangeLog b/ChangeLog
index 4cb1e7ce3..93a0645ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-12-23  Bruno Haible  <bruno@clisp.org>
+
+	* autogen.sh (GNULIB_MODULES_TOOLS_OTHER): Add stdint.
+
 2006-12-21  Bruno Haible  <bruno@clisp.org>
 
 	* autogen.sh: Pass --makefile-name option to gnulib-tool for
diff --git a/autogen.sh b/autogen.sh
index 9d37b8ce0..000303762 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -169,6 +169,7 @@ if test -n "$GNULIB_TOOL"; then
   gettext-tools-misc
   gcj
   java
+  stdint
   '
   $GNULIB_TOOL --dir=gettext-tools --lib=libgettextlib --source-base=gnulib-lib --m4-base=gnulib-m4 --makefile-name=Makefile.gnulib --libtool --local-dir=gnulib-local --local-symlink \
     --import $GNULIB_MODULES_TOOLS_FOR_SRC $GNULIB_MODULES_TOOLS_OTHER
diff --git a/gettext-tools/libuniname/ChangeLog b/gettext-tools/libuniname/ChangeLog
index a90fba248..3b7324bfc 100644
--- a/gettext-tools/libuniname/ChangeLog
+++ b/gettext-tools/libuniname/ChangeLog
@@ -1,3 +1,8 @@
+2006-12-23  Bruno Haible  <bruno@clisp.org>
+
+	* uniname.c: Include stdint.h.
+	(uint16_t, uint32_t): Remove definitions.
+
 2006-11-27  Bruno Haible  <bruno@clisp.org>
 
 	* gettext-0.16.1 released.
diff --git a/gettext-tools/libuniname/uniname.c b/gettext-tools/libuniname/uniname.c
index 96bb7eddf..1bdfae221 100644
--- a/gettext-tools/libuniname/uniname.c
+++ b/gettext-tools/libuniname/uniname.c
@@ -24,6 +24,7 @@
 
 #include <assert.h>
 #include <stdbool.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <string.h>
 
@@ -31,8 +32,6 @@
 
 
 /* Table of Unicode character names, derived from UnicodeData.txt.  */
-#define uint16_t unsigned short
-#define uint32_t unsigned int
 #include "uninames.h"
 /* It contains:
   static const char unicode_name_words[34594] = ...;