From d33e27b00b65fc12a046ca1f1bdb17bc5c1d1585 Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Mon, 4 Oct 2004 12:43:45 +0000
Subject: [PATCH] no vasnprintf.h, either; argz_.h from libtool

---
 config/srclist.txt |  4 ++--
 lib/argz_.h        | 24 ++++++++++++++++--------
 2 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/config/srclist.txt b/config/srclist.txt
index e6401e2371..e4721c64a0 100644
--- 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 423a071b21..506e27001a 100644
--- 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)*/
-- 
2.30.2