no vasnprintf.h, either; argz_.h from libtool

diff --git a/config/srclist.txt b/config/srclist.txt
index e6401e2371e6722c17c42b9cd48fabcf1a7be69b..e4721c64a0ff216e34de7624376cd7f11e298076 100644 (file)
--- a/config/srclist.txt
+++ b/config/srclist.txt
@@ -1,4 +1,4 @@
-# $Id: srclist.txt,v 1.46 2004-10-03 13:06:06 karl Exp $
+# $Id: srclist.txt,v 1.47 2004-10-04 12:43:45 karl Exp $
 # Files for which we are not the source.  See ./srclistvars.sh for the
 # variable definitions.
 
@@ -30,7 +30,7 @@ $GETTEXT/gettext-runtime/libasprintf/printf-args.h    lib gpl
 $GETTEXT/gettext-runtime/libasprintf/printf-parse.c    lib gpl
 $GETTEXT/gettext-runtime/libasprintf/printf-parse.h    lib gpl
 ##$GETTEXT/gettext-runtime/libasprintf/vasnprintf.c    lib gpl
-$GETTEXT/gettext-runtime/libasprintf/vasnprintf.h      lib gpl
+##$GETTEXT/gettext-runtime/libasprintf/vasnprintf.h    lib gpl
 #$GETTEXT/gettext-runtime/libasprintf/vasprintf.c      lib gpl
 # Ugly: we currently need to take vasprintf.h from the wrong directory.
 #$GETTEXT/gettext-runtime/libasprintf/vasprintf.h      lib gpl (not yet)

diff --git a/lib/argz_.h b/lib/argz_.h
index 423a071b218b2588f7168189ea5ae98ee63d10d1..506e27001a2e9e912cfbcb5ae9987b65c9611cc9 100644 (file)
--- a/lib/argz_.h
+++ b/lib/argz_.h
@@ -27,23 +27,31 @@
 
 #if defined(LTDL)
 #  include "lt__glibc.h"
+#  include "lt_system.h"
+#else
+#  define LT_SCOPE
 #endif
 
 #if defined(_cplusplus)
 extern "C" {
 #endif
 
-error_t        argz_append     (char **pargz, size_t *pargz_len,
-                        const char *buf, size_t buf_len);
-error_t        argz_create_sep (const char *str, int delim,
-                        char **pargz, size_t *pargz_len);
-error_t        argz_insert     (char **pargz, size_t *pargz_len,
-                        char *before, const char *entry);
-char * argz_next       (char *argz, size_t argz_len, const char *entry);
-void   argz_stringify  (char *argz, size_t argz_len, int sep);
+LT_SCOPE error_t argz_append   (char **pargz, size_t *pargz_len,
+                                const char *buf, size_t buf_len);
+LT_SCOPE error_t argz_create_sep(const char *str, int delim,
+                                char **pargz, size_t *pargz_len);
+LT_SCOPE error_t argz_insert   (char **pargz, size_t *pargz_len,
+                                char *before, const char *entry);
+LT_SCOPE char *         argz_next      (char *argz, size_t argz_len,
+                                const char *entry);
+LT_SCOPE void   argz_stringify (char *argz, size_t argz_len, int sep);
 
 #if defined(_cplusplus)
 }
 #endif
 
+#if !defined(LTDL)
+#  undef LT_SCOPE
+#endif
+
 #endif /*!defined(LT__ARGZ_H)*/