From: Bruno Haible <bruno@clisp.org>
Date: Fri, 28 Nov 2003 20:44:01 +0000 (+0000)
Subject: Updates for the MSVC port.
X-Git-Tag: v0.13~27
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2cdec46361b69309c77a872e4684a2271cfc4317;p=thirdparty%2Fgettext.git

Updates for the MSVC port.
---

diff --git a/gettext-runtime/ChangeLog b/gettext-runtime/ChangeLog
index 0c4117174..81d422c8d 100644
--- 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 594089943..174726cb6 100644
--- 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 30f576500..ec6c4e66e 100644
--- 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 093f9e6b6..cb2be82fc 100644
--- 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 00ec3945b..6844cd80f 100644
--- 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 b2bf054b6..759ce070f 100644
--- 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 eb504d1a6..df2d0c8ac 100644
--- 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/' \