Update the config.h.msvc generation.

diff --git a/gettext-runtime/libasprintf/ChangeLog b/gettext-runtime/libasprintf/ChangeLog
index 64b07cadd4010cf463893f08c930f147950c408f..5fd76953133dc732674ea7cfd77c6e264c2d4101 100644 (file)
--- a/gettext-runtime/libasprintf/ChangeLog
+++ b/gettext-runtime/libasprintf/ChangeLog
@@ -4,6 +4,8 @@
        as a function.
        * vasnprintf.c: Test HAVE_DECL__SNPRINTF instead of HAVE__SNPRINTF.
        Test HAVE_DECL__SNWPRINTF instead of HAVE__SNWPRINTF.
+       * Makefile.am (config.h.msvc): Define HAVE_DECL__SNPRINTF instead of
+       defining snprintf as a macro.
 
 2003-08-24  Bruno Haible  <bruno@clisp.org>
 

diff --git a/gettext-runtime/libasprintf/Makefile.am b/gettext-runtime/libasprintf/Makefile.am
index 891904756a4894dba608be387e98155a5ac1b3fe..8804be6502c84e138254cd61fab11097621d96d8 100644 (file)
--- a/gettext-runtime/libasprintf/Makefile.am
+++ b/gettext-runtime/libasprintf/Makefile.am
@@ -209,16 +209,17 @@ EXTRA_DIST += Makefile.vms config.h_vms
 # Woe32 support.
 
 config.h.msvc: config.h.in
-       (sed -e 's/#undef HAVE_ALLOCA$$/#define HAVE_ALLOCA 1/' \
-            -e 's/#undef HAVE_LONG_DOUBLE$$/#define HAVE_LONG_DOUBLE 1/' \
-            -e 's/#undef HAVE_PTRDIFF_T$$/#define HAVE_PTRDIFF_T 1/' \
-            -e 's/#undef HAVE_SNPRINTF$$/#define HAVE_SNPRINTF 1/' \
-            -e 's/#undef HAVE_STDLIB_H$$/#define HAVE_STDLIB_H 1/' \
-            -e 's/#undef HAVE_STRING_H$$/#define HAVE_STRING_H 1/' \
-            -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/' \
-          < $(srcdir)/config.h.in; echo; echo '#define snprintf _snprintf') > $@
+       sed -e 's/#undef HAVE_ALLOCA$$/#define HAVE_ALLOCA 1/' \
+           -e 's/#undef HAVE_DECL__SNPRINTF$$/#define HAVE_DECL__SNPRINTF 1/' \
+           -e 's/#undef HAVE_LONG_DOUBLE$$/#define HAVE_LONG_DOUBLE 1/' \
+           -e 's/#undef HAVE_PTRDIFF_T$$/#define HAVE_PTRDIFF_T 1/' \
+           -e 's/#undef HAVE_SNPRINTF$$/#define HAVE_SNPRINTF 1/' \
+           -e 's/#undef HAVE_STDLIB_H$$/#define HAVE_STDLIB_H 1/' \
+           -e 's/#undef HAVE_STRING_H$$/#define HAVE_STRING_H 1/' \
+           -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/' \
+         < $(srcdir)/config.h.in > $@
 
 autosprintf.h.msvc-shared: autosprintf.h.in windows/dllexport.h
        sed -e 's/extern \([^"]\)/extern LIBASPRINTF_DLL_EXPORTED \1/' \