Portability tweaks for NetBSD.

diff --git a/gettext-runtime/libasprintf/ChangeLog b/gettext-runtime/libasprintf/ChangeLog
index 9e8ce65b1b84c7ef410d2847cdbc89a07aff8c72..052969ed669db1be4ecd0ee20062ab2d21dfeb9a 100644 (file)
--- a/gettext-runtime/libasprintf/ChangeLog
+++ b/gettext-runtime/libasprintf/ChangeLog
@@ -1,3 +1,8 @@
+2003-08-29  Bruno Haible  <bruno@clisp.org>
+
+       * vasnprintf.c: Test HAVE_DECL__SNPRINTF instead of HAVE__SNPRINTF.
+       Test HAVE_DECL__SNWPRINTF instead of HAVE__SNWPRINTF.
+
 2003-08-24  Bruno Haible  <bruno@clisp.org>
 
        * vasnprintf.c (local_wcslen): Protect against multiple definition.

diff --git a/gettext-runtime/libasprintf/configure.ac b/gettext-runtime/libasprintf/configure.ac
index 7e9e1e6a7d739b507e67ac30ec5cfcb87678a38a..e4c7f31bdafc20ef7e7d576bbbcbb7a73b73dd93 100644 (file)
--- a/gettext-runtime/libasprintf/configure.ac
+++ b/gettext-runtime/libasprintf/configure.ac
@@ -68,7 +68,8 @@ AC_EGREP_CPP([Need own alloca], [
   ALLOCA_H=)
 AC_SUBST([ALLOCA_H])
 
-AC_CHECK_FUNCS([snprintf vasprintf wcslen _snprintf])
+AC_CHECK_FUNCS([snprintf vasprintf wcslen])
+AC_CHECK_DECLS([_snprintf])
 gt_PRINTF_POSIX
 
 dnl Check for tools needed for formatting the documentation.

diff --git a/gettext-runtime/libasprintf/vasnprintf.c b/gettext-runtime/libasprintf/vasnprintf.c
index 28938549f82d9d342cadc38799f385f906db4a16..7a46ca99aee16b48b4bd7c305d41e770ea785a57 100644 (file)
--- a/gettext-runtime/libasprintf/vasnprintf.c
+++ b/gettext-runtime/libasprintf/vasnprintf.c
@@ -88,7 +88,7 @@ local_wcslen (const wchar_t *s)
 # define DIRECTIVES wchar_t_directives
 # define PRINTF_PARSE wprintf_parse
 # define USE_SNPRINTF 1
-# if HAVE__SNWPRINTF
+# if HAVE_DECL__SNWPRINTF
    /* On Windows, the function swprintf() has a different signature than
       on Unix; we use the _snwprintf() function instead.  */
 #  define SNPRINTF _snwprintf
@@ -102,8 +102,8 @@ local_wcslen (const wchar_t *s)
 # define DIRECTIVE char_directive
 # define DIRECTIVES char_directives
 # define PRINTF_PARSE printf_parse
-# define USE_SNPRINTF (HAVE__SNPRINTF || HAVE_SNPRINTF)
-# if HAVE__SNPRINTF
+# define USE_SNPRINTF (HAVE_DECL__SNPRINTF || HAVE_SNPRINTF)
+# if HAVE_DECL__SNPRINTF
    /* Windows.  */
 #  define SNPRINTF _snprintf
 # else