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 4cb1e7ce3b08d1b4e226ffc609c913ee24ab453b..93a0645ba374a623b30330610c6fd43e9dbba81d 100644 (file)
--- 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 9d37b8ce03ca38ed53b3d7d06d639c025afce005..00030376281b98c75494ce6a1c13d7503f7a766b 100755 (executable)
--- 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 a90fba248a1832a2c69c580bca1478a59b94a37f..3b7324bfce2cf4e76209c8d4cb631a99df3be5fd 100644 (file)
--- 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 96bb7eddf9a4594f9dca7ae080d21929e0291030..1bdfae22174d64b862dbbc6705f61f2567b3328d 100644 (file)
--- 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] = ...;