From: Bruno Haible Date: Mon, 1 Oct 2007 22:05:40 +0000 (+0200) Subject: Rename argz_.h to argz.in.h. X-Git-Tag: v0.0~180 X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=5155f7d837cf63d8670ad4bf4ead7d29b76ee8b9;p=gnulib.git Rename argz_.h to argz.in.h. --- diff --git a/ChangeLog b/ChangeLog index f23d5f4ea..b79124309 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,8 @@ * lib/alloca.in.h: Renamed from lib/alloca_.h. * modules/alloca-opt (Files, Makefile.am): Use alloca.in.h instead of alloca_.h. + * lib/argz.in.h: Renamed from lib/argz_.h. + * modules/argz (Files, Makefile.am): Use argz.in.h instead of argz_.h. 2007-09-30 Bruno Haible diff --git a/lib/argz.in.h b/lib/argz.in.h new file mode 100644 index 000000000..83acf884d --- /dev/null +++ b/lib/argz.in.h @@ -0,0 +1,68 @@ +/* lt__argz.h -- internal argz interface for non-glibc systems + + Copyright (C) 2004, 2007 Free Software Foundation, Inc. + Written by Gary V. Vaughan, 2004 + + NOTE: The canonical source of this file is maintained with the + GNU Libtool package. Report bugs to bug-libtool@gnu.org. + +GNU Libltdl is free software; you can redistribute it and/or +modify it under the terms of the GNU Lesser General Public +License as published by the Free Software Foundation; either +version 2 of the License, or (at your option) any later version. + +As a special exception to the GNU Lesser General Public License, +if you distribute this file as part of a program or library that +is built using GNU Libtool, you may include this file under the +same distribution terms that you use for the rest of that program. + +GNU Libltdl is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU Lesser General Public License for more details. + +You should have received a copy of the GNU Lesser General Public +License along with GNU Libltdl; see the file COPYING.LIB. If not, a +copy can be downloaded from http://www.gnu.org/licenses/lgpl.html, +or obtained by writing to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +*/ + +#if !defined(LT__ARGZ_H) +#define LT__ARGZ_H 1 + +#include +#define __need_error_t +#include +#include + +#if defined(LTDL) +# include "lt__glibc.h" +# include "lt_system.h" +#else +# define LT_SCOPE +#endif + +#if defined(__cplusplus) +extern "C" { +#endif + +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)*/ diff --git a/lib/argz_.h b/lib/argz_.h deleted file mode 100644 index 83acf884d..000000000 --- a/lib/argz_.h +++ /dev/null @@ -1,68 +0,0 @@ -/* lt__argz.h -- internal argz interface for non-glibc systems - - Copyright (C) 2004, 2007 Free Software Foundation, Inc. - Written by Gary V. Vaughan, 2004 - - NOTE: The canonical source of this file is maintained with the - GNU Libtool package. Report bugs to bug-libtool@gnu.org. - -GNU Libltdl is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2 of the License, or (at your option) any later version. - -As a special exception to the GNU Lesser General Public License, -if you distribute this file as part of a program or library that -is built using GNU Libtool, you may include this file under the -same distribution terms that you use for the rest of that program. - -GNU Libltdl is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with GNU Libltdl; see the file COPYING.LIB. If not, a -copy can be downloaded from http://www.gnu.org/licenses/lgpl.html, -or obtained by writing to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -*/ - -#if !defined(LT__ARGZ_H) -#define LT__ARGZ_H 1 - -#include -#define __need_error_t -#include -#include - -#if defined(LTDL) -# include "lt__glibc.h" -# include "lt_system.h" -#else -# define LT_SCOPE -#endif - -#if defined(__cplusplus) -extern "C" { -#endif - -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)*/ diff --git a/modules/argz b/modules/argz index 7f21c008a..601abb722 100644 --- a/modules/argz +++ b/modules/argz @@ -2,7 +2,7 @@ Description: Argv style string arrays in a single null delimited char*. Files: -lib/argz_.h +lib/argz.in.h lib/argz.c m4/argz.m4 @@ -16,9 +16,9 @@ BUILT_SOURCES += $(ARGZ_H) # We need the following in order to create when the system # doesn't have one that works with the given compiler. -argz.h: argz_.h +argz.h: argz.in.h { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ - cat $(srcdir)/argz_.h; \ + cat $(srcdir)/argz.in.h; \ } > $@-t mv -f $@-t $@ MOSTLYCLEANFILES += argz.h argz.h-t