From 3e74d28383461f4b548aab64e3dde565499dee38 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 2 Oct 2007 00:33:23 +0200 Subject: [PATCH] Rename string_.h to string.in.h. --- ChangeLog | 4 ++++ doc/gnulib-tool.texi | 4 ++-- lib/{string_.h => string.in.h} | 0 m4/mempcpy.m4 | 4 ++-- m4/stpcpy.m4 | 4 ++-- m4/stpncpy.m4 | 4 ++-- m4/strsep.m4 | 4 ++-- m4/strtok_r.m4 | 4 ++-- modules/string | 6 +++--- 9 files changed, 19 insertions(+), 15 deletions(-) rename lib/{string_.h => string.in.h} (100%) diff --git a/ChangeLog b/ChangeLog index 423a33864..d85d97c94 100644 --- a/ChangeLog +++ b/ChangeLog @@ -59,6 +59,10 @@ * lib/stdlib.in.h: Renamed from lib/stdlib_.h. * modules/stdlib (Files, Makefile.am): Use stdlib.in.h instead of stdlib_.h. + * lib/string.in.h: Renamed from lib/string_.h. + * modules/string (Files, Makefile.am): Use string.in.h instead of + string_.h. + * doc/gnulib-tool.texi (Initial import): Update. 2007-09-30 Bruno Haible diff --git a/doc/gnulib-tool.texi b/doc/gnulib-tool.texi index d32f8da5d..f97c74126 100644 --- a/doc/gnulib-tool.texi +++ b/doc/gnulib-tool.texi @@ -60,7 +60,7 @@ Module list with included dependencies: File list: lib/dummy.c lib/strdup.c - lib/string_.h + lib/string.in.h m4/absolute-header.m4 m4/extensions.m4 m4/gnulib-common.m4 @@ -70,7 +70,7 @@ Creating directory ./lib Creating directory ./m4 Copying file lib/dummy.c Copying file lib/strdup.c -Copying file lib/string_.h +Copying file lib/string.in.h Copying file m4/absolute-header.m4 Copying file m4/extensions.m4 Copying file m4/gnulib-common.m4 diff --git a/lib/string_.h b/lib/string.in.h similarity index 100% rename from lib/string_.h rename to lib/string.in.h diff --git a/m4/mempcpy.m4 b/m4/mempcpy.m4 index 13293b556..d1a12ebfd 100644 --- a/m4/mempcpy.m4 +++ b/m4/mempcpy.m4 @@ -1,4 +1,4 @@ -# mempcpy.m4 serial 8 +# mempcpy.m4 serial 9 dnl Copyright (C) 2003, 2004, 2006, 2007 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -9,7 +9,7 @@ AC_DEFUN([gl_FUNC_MEMPCPY], dnl Persuade glibc to declare mempcpy(). AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) - dnl The mempcpy() declaration in lib/string_.h uses 'restrict'. + dnl The mempcpy() declaration in lib/string.in.h uses 'restrict'. AC_REQUIRE([AC_C_RESTRICT]) AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) diff --git a/m4/stpcpy.m4 b/m4/stpcpy.m4 index bef09ed06..c38f40ee6 100644 --- a/m4/stpcpy.m4 +++ b/m4/stpcpy.m4 @@ -1,4 +1,4 @@ -# stpcpy.m4 serial 5 +# stpcpy.m4 serial 6 dnl Copyright (C) 2002, 2007 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -9,7 +9,7 @@ AC_DEFUN([gl_FUNC_STPCPY], dnl Persuade glibc to declare stpcpy(). AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) - dnl The stpcpy() declaration in lib/string_.h uses 'restrict'. + dnl The stpcpy() declaration in lib/string.in.h uses 'restrict'. AC_REQUIRE([AC_C_RESTRICT]) AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) diff --git a/m4/stpncpy.m4 b/m4/stpncpy.m4 index 21771321b..1269359c1 100644 --- a/m4/stpncpy.m4 +++ b/m4/stpncpy.m4 @@ -1,4 +1,4 @@ -# stpncpy.m4 serial 8 +# stpncpy.m4 serial 9 dnl Copyright (C) 2002-2003, 2005-2007 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -9,7 +9,7 @@ AC_DEFUN([gl_FUNC_STPNCPY], dnl Persuade glibc to declare stpncpy(). AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) - dnl The stpncpy() declaration in lib/string_.h uses 'restrict'. + dnl The stpncpy() declaration in lib/string.in.h uses 'restrict'. AC_REQUIRE([AC_C_RESTRICT]) AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) diff --git a/m4/strsep.m4 b/m4/strsep.m4 index acbd8d1c0..1231dcb12 100644 --- a/m4/strsep.m4 +++ b/m4/strsep.m4 @@ -1,4 +1,4 @@ -# strsep.m4 serial 7 +# strsep.m4 serial 8 dnl Copyright (C) 2002, 2003, 2004, 2007 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -9,7 +9,7 @@ AC_DEFUN([gl_FUNC_STRSEP], dnl Persuade glibc to declare strsep(). AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) - dnl The strsep() declaration in lib/string_.h uses 'restrict'. + dnl The strsep() declaration in lib/string.in.h uses 'restrict'. AC_REQUIRE([AC_C_RESTRICT]) AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) diff --git a/m4/strtok_r.m4 b/m4/strtok_r.m4 index 03cff0941..930fed731 100644 --- a/m4/strtok_r.m4 +++ b/m4/strtok_r.m4 @@ -1,4 +1,4 @@ -# strtok_r.m4 serial 6 +# strtok_r.m4 serial 7 dnl Copyright (C) 2002, 2003, 2004, 2007 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -6,7 +6,7 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_STRTOK_R], [ - dnl The strtok_r() declaration in lib/string_.h uses 'restrict'. + dnl The strtok_r() declaration in lib/string.in.h uses 'restrict'. AC_REQUIRE([AC_C_RESTRICT]) AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) diff --git a/modules/string b/modules/string index c4e9f2f9b..f53253b8c 100644 --- a/modules/string +++ b/modules/string @@ -2,7 +2,7 @@ Description: A GNU-like . Files: -lib/string_.h +lib/string.in.h m4/string_h.m4 Depends-on: @@ -18,7 +18,7 @@ BUILT_SOURCES += string.h # We need the following in order to create when the system # doesn't have one that works with the given compiler. -string.h: string_.h +string.h: string.in.h rm -f $@-t $@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \ sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \ @@ -70,7 +70,7 @@ string.h: string_.h -e 's|@''HAVE_DECL_STRERROR''@|$(HAVE_DECL_STRERROR)|g' \ -e 's|@''REPLACE_STRERROR''@|$(REPLACE_STRERROR)|g' \ -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \ - < $(srcdir)/string_.h; \ + < $(srcdir)/string.in.h; \ } > $@-t mv $@-t $@ MOSTLYCLEANFILES += string.h string.h-t -- 2.11.0