Updates for the MSVC port.

diff --git a/gettext-runtime/ChangeLog b/gettext-runtime/ChangeLog
index 0c411717442f9c4f303f8c32057a719abeab898f..81d422c8dd14472eeaf6455d1f31110d35580577 100644 (file)
--- a/gettext-runtime/ChangeLog
+++ b/gettext-runtime/ChangeLog
@@ -1,3 +1,7 @@
+2003-11-28  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am (config.h.msvc): Define SIZE_MAX and inline.
+
 2003-11-16  Bruno Haible  <bruno@clisp.org>
 
        * configure.ac (man/Makefile): Postprocess with FIX_MAKEFILE_DISTRIB.

diff --git a/gettext-runtime/Makefile.am b/gettext-runtime/Makefile.am
index 5940899439e73a213f99cbd903e9d733d97d2bfd..174726cb6df566e7e10544a1c874f21a83b75a47 100644 (file)
--- a/gettext-runtime/Makefile.am
+++ b/gettext-runtime/Makefile.am
@@ -160,9 +160,10 @@ config.h.msvc: config.h.in ../version.sh
            -e 's/#undef HAVE_WINT_T$$/#define HAVE_WINT_T 1/' \
            -e 's/#undef HAVE_WPRINTF$$/#define HAVE_WPRINTF 1/' \
            -e 's/#undef ICONV_CONST$$/#define ICONV_CONST const/' \
+           -e 's/#undef SIZE_MAX$$/#define SIZE_MAX 2147483647U/' \
            -e 's/#undef STACK_DIRECTION$$/#define STACK_DIRECTION -1/' \
            -e 's/#undef STDC_HEADERS$$/#define STDC_HEADERS 1/' \
-           -e 's/#undef inline$$/#define inline/' \
+           -e 's/#undef inline$$/#define inline __inline/' \
            -e 's/#undef ssize_t$$/#define ssize_t int/' \
            -e 's/#undef uintmax_t$$/#define uintmax_t unsigned long/' \
            -e 's/#undef PACKAGE$$/#define PACKAGE "gettext-runtime"/' \

diff --git a/gettext-runtime/libasprintf/ChangeLog b/gettext-runtime/libasprintf/ChangeLog
index 30f576500ea5451c45b901b16b783ef1ecbf46fb..ec6c4e66e78c24c8996f6cf1c4e8f4c623c11fd0 100644 (file)
--- a/gettext-runtime/libasprintf/ChangeLog
+++ b/gettext-runtime/libasprintf/ChangeLog
@@ -1,3 +1,8 @@
+2003-11-28  Bruno Haible  <bruno@clisp.org>
+
+       * configure.ac: Invoke AC_C_INLINE.
+       * Makefile.am (config.h.msvc): Define SIZE_MAX and inline.
+
 2003-11-23  Paul Eggert  <eggert@twinsun.com>
             Bruno Haible  <bruno@clisp.org>
 

diff --git a/gettext-runtime/libasprintf/Makefile.am b/gettext-runtime/libasprintf/Makefile.am
index 093f9e6b69f2e2a7040c1ba4dcbd99ec735cd5d3..cb2be82fc55e992b12992ce8fa64ae3cb764a7e7 100644 (file)
--- a/gettext-runtime/libasprintf/Makefile.am
+++ b/gettext-runtime/libasprintf/Makefile.am
@@ -224,6 +224,8 @@ config.h.msvc: config.h.in
            -e 's/#undef HAVE_WCHAR_T$$/#define HAVE_WCHAR_T 1/' \
            -e 's/#undef HAVE_WCSLEN$$/#define HAVE_WCSLEN 1/' \
            -e 's/#undef HAVE_WINT_T$$/#define HAVE_WINT_T 1/' \
+           -e 's/#undef SIZE_MAX$$/#define SIZE_MAX 2147483647U/' \
+           -e 's/#undef inline$$/#define inline __inline/' \
          < $(srcdir)/config.h.in > $@
 
 autosprintf.h.msvc-shared: autosprintf.h.in windows/dllexport.h

diff --git a/gettext-runtime/libasprintf/configure.ac b/gettext-runtime/libasprintf/configure.ac
index 00ec3945b38992e75eec22bf4f721384ef9d1289..6844cd80f93f1a914103c77d8bc561c56cfb575b 100644 (file)
--- a/gettext-runtime/libasprintf/configure.ac
+++ b/gettext-runtime/libasprintf/configure.ac
@@ -46,6 +46,7 @@ dnl Checks for header files.
 
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
+AC_C_INLINE
 bh_C_SIGNED
 AC_TYPE_SIZE_T
 jm_AC_TYPE_LONG_LONG

diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog
index b2bf054b6eed65eef58a1250b20fd4c472d679eb..759ce070f13f2e2737e980d64024a5543c3efa9e 100644 (file)
--- a/gettext-tools/ChangeLog
+++ b/gettext-tools/ChangeLog
@@ -1,3 +1,7 @@
+2003-11-28  Bruno Haible  <bruno@clisp.org>
+
+       * Makefile.am (config.h.msvc): Define SIZE_MAX and inline.
+
 2003-11-28  Bruno Haible  <bruno@clisp.org>
 
        * windows/gettextlib.def: Add at_fatal_signal, block_fatal_signals,

diff --git a/gettext-tools/Makefile.am b/gettext-tools/Makefile.am
index eb504d1a6311d507a017876bbb691032c3637763..df2d0c8ac62b0bf8ef0c3009cc361ddd5a72c471 100644 (file)
--- a/gettext-tools/Makefile.am
+++ b/gettext-tools/Makefile.am
@@ -204,11 +204,12 @@ config.h.msvc: config.h.in ../version.sh
            -e 's/#undef HAVE_WPRINTF$$/#define HAVE_WPRINTF 1/' \
            -e 's/#undef ICONV_CONST$$/#define ICONV_CONST const/' \
            -e 's/#undef SETLOCALE_CONST$$/#define SETLOCALE_CONST const/' \
+           -e 's/#undef SIZE_MAX$$/#define SIZE_MAX 2147483647U/' \
            -e 's/#undef STACK_DIRECTION$$/#define STACK_DIRECTION -1/' \
            -e 's/#undef STDC_HEADERS$$/#define STDC_HEADERS 1/' \
            -e 's/#undef fnmatch$$/#define fnmatch rpl_fnmatch/' \
            -e 's/#undef getline$$/#define getline rpl_getline/' \
-           -e 's/#undef inline$$/#define inline/' \
+           -e 's/#undef inline$$/#define inline __inline/' \
            -e 's/#undef mode_t$$/#define mode_t int/' \
            -e 's/#undef pid_t$$/#define pid_t int/' \
            -e 's/#undef ssize_t$$/#define ssize_t int/' \