Deal with system dependent naming of s*printf functions.

diff --git a/gettext-runtime/intl/ChangeLog b/gettext-runtime/intl/ChangeLog
index ed6f5c392918b2f0a25ce706eb130fce65dbf4fc..bd186bc83166f75f8029f16c9bf3397586ec0602 100644 (file)
--- a/gettext-runtime/intl/ChangeLog
+++ b/gettext-runtime/intl/ChangeLog
@@ -5,6 +5,10 @@
        (SNPRINTF): Possibly define as _snprintf or _snwprintf.
        * printf.c (DLL_EXPORTED): New macro.
        Mark all functions as DLL_EXPORTED.
+       (system_vsnprintf): New macro.
+       (libintl_vsnprintf): Use it.
+       (system_vswprintf): New macro.
+       (libintl_vswprintf): Use it.
 
 2003-08-24  Bruno Haible  <bruno@clisp.org>
 

diff --git a/gettext-runtime/intl/printf.c b/gettext-runtime/intl/printf.c
index 52f774c087ce718fa475872a91ea3ce291af1bea..08846a8520899d53da7a2cb4dad0706de846a370 100644 (file)
--- a/gettext-runtime/intl/printf.c
+++ b/gettext-runtime/intl/printf.c
@@ -164,12 +164,20 @@ libintl_sprintf (char *resultbuf, const char *format, ...)
 
 #if HAVE_SNPRINTF
 
+# if HAVE__SNPRINTF
+   /* Windows.  */
+#  define system_vsnprintf _vsnprintf
+# else
+   /* Unix.  */
+#  define system_vsnprintf vsnprintf
+# endif
+
 DLL_EXPORTED
 int
 libintl_vsnprintf (char *resultbuf, size_t length, const char *format, va_list args)
 {
   if (strchr (format, '$') == NULL)
-    return vsnprintf (resultbuf, length, format, args);
+    return system_vsnprintf (resultbuf, length, format, args);
   else
     {
       size_t maxlength = length;
@@ -252,6 +260,14 @@ libintl_asprintf (char **resultp, const char *format, ...)
 #include "asnprintf.c"
 #endif
 
+# if HAVE__SNWPRINTF
+   /* Windows.  */
+#  define system_vswprintf _vsnwprintf
+# else
+   /* Unix.  */
+#  define system_vswprintf vswprintf
+# endif
+
 DLL_EXPORTED
 int
 libintl_vfwprintf (FILE *stream, const wchar_t *format, va_list args)
@@ -315,7 +331,7 @@ int
 libintl_vswprintf (wchar_t *resultbuf, size_t length, const wchar_t *format, va_list args)
 {
   if (wcschr (format, '$') == NULL)
-    return vswprintf (resultbuf, length, format, args);
+    return system_vswprintf (resultbuf, length, format, args);
   else
     {
       size_t maxlength = length;