changeset 5313:01de4c6c85e8

no vasnprintf.h, either; argz_.h from libtool
author Karl Berry <karl@freefriends.org>
date Mon, 04 Oct 2004 12:43:45 +0000
parents 47f04c1cec16
children 1b1a1773fbcb
files config/srclist.txt lib/argz_.h
diffstat 2 files changed, 18 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- 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-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)
--- 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)*/