From ffc927eef29016a5219cd969daad8928af6a1f4d Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 8 Apr 2017 23:48:02 -0700 Subject: [PATCH] getopt: prefer - to _ in new file names * lib/getopt-cdefs.in.h: Rename from lib/getopt_cdefs.in.h. * lib/getopt-core.h: Rename from lib/getopt_core.h. * lib/getopt-ext.h: Rename from lib/getopt_ext.h. * lib/getopt-pfx-core.h: Rename from lib/getopt_pfx_core.h. * lib/getopt-pfx-ext.h: Rename from lib/getopt_pfx_ext.h. All uses changed. --- ChangeLog | 8 ++++++++ lib/{getopt_cdefs.in.h => getopt-cdefs.in.h} | 4 ++-- lib/{getopt_core.h => getopt-core.h} | 2 +- lib/{getopt_ext.h => getopt-ext.h} | 2 +- lib/{getopt_pfx_core.h => getopt-pfx-core.h} | 6 +++--- lib/{getopt_pfx_ext.h => getopt-pfx-ext.h} | 6 +++--- lib/getopt.in.h | 8 ++++---- lib/unistd.in.h | 4 ++-- m4/getopt.m4 | 4 ++-- modules/getopt-posix | 16 ++++++++-------- 10 files changed, 34 insertions(+), 26 deletions(-) rename lib/{getopt_cdefs.in.h => getopt-cdefs.in.h} (95%) rename lib/{getopt_core.h => getopt-core.h} (99%) rename lib/{getopt_ext.h => getopt-ext.h} (99%) rename lib/{getopt_pfx_core.h => getopt-pfx-core.h} (94%) rename lib/{getopt_pfx_ext.h => getopt-pfx-ext.h} (95%) diff --git a/ChangeLog b/ChangeLog index 595f2ba43d..ae1a8bd9e7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2017-04-08 Paul Eggert + getopt: prefer - to _ in new file names + * lib/getopt-cdefs.in.h: Rename from lib/getopt_cdefs.in.h. + * lib/getopt-core.h: Rename from lib/getopt_core.h. + * lib/getopt-ext.h: Rename from lib/getopt_ext.h. + * lib/getopt-pfx-core.h: Rename from lib/getopt_pfx_core.h. + * lib/getopt-pfx-ext.h: Rename from lib/getopt_pfx_ext.h. + All uses changed. + getopt: port recent getopt changes to macOS Problem reported by Harald Maier (Bug#26398). The macOS C compiler uses __nonnull for its own purposes and that diff --git a/lib/getopt_cdefs.in.h b/lib/getopt-cdefs.in.h similarity index 95% rename from lib/getopt_cdefs.in.h rename to lib/getopt-cdefs.in.h index 54da28d1f2..8984adb3aa 100644 --- a/lib/getopt_cdefs.in.h +++ b/lib/getopt-cdefs.in.h @@ -25,7 +25,7 @@ unistd.h instead. It does not have a protective #error, because the guard macro for getopt.h in gnulib is not fixed. */ -/* getopt_core.h and getopt_ext.h are shared with GNU libc, and expect +/* getopt-core.h and getopt-ext.h are shared with GNU libc, and expect a number of the internal macros supplied to GNU libc's headers by sys/cdefs.h. Provide fallback definitions for all of them. */ #if @HAVE_SYS_CDEFS_H@ @@ -64,4 +64,4 @@ # endif #endif -#endif /* getopt_cdefs.h */ +#endif /* _GETOPT_CDEFS_H */ diff --git a/lib/getopt_core.h b/lib/getopt-core.h similarity index 99% rename from lib/getopt_core.h rename to lib/getopt-core.h index 76ef46646c..8c9eb51223 100644 --- a/lib/getopt_core.h +++ b/lib/getopt-core.h @@ -93,4 +93,4 @@ extern int getopt (int ___argc, char *const *___argv, const char *__shortopts) __END_DECLS -#endif /* getopt_core.h */ +#endif /* _GETOPT_CORE_H */ diff --git a/lib/getopt_ext.h b/lib/getopt-ext.h similarity index 99% rename from lib/getopt_ext.h rename to lib/getopt-ext.h index a3a6750875..94190df3a1 100644 --- a/lib/getopt_ext.h +++ b/lib/getopt-ext.h @@ -74,4 +74,4 @@ extern int getopt_long_only (int ___argc, char *__getopt_argv_const *___argv, __END_DECLS -#endif /* getopt_ext.h */ +#endif /* _GETOPT_EXT_H */ diff --git a/lib/getopt_pfx_core.h b/lib/getopt-pfx-core.h similarity index 94% rename from lib/getopt_pfx_core.h rename to lib/getopt-pfx-core.h index b730d2d8d9..155c11612d 100644 --- a/lib/getopt_pfx_core.h +++ b/lib/getopt-pfx-core.h @@ -27,7 +27,7 @@ /* Standalone applications should #define __GETOPT_PREFIX to an identifier that prefixes the external functions and variables - defined in getopt_core.h and getopt_ext.h. Systematically + defined in getopt-core.h and getopt-ext.h. Systematically rename identifiers so that they do not collide with the system functions and variables. Renaming avoids problems with some compilers and linkers. */ @@ -49,6 +49,6 @@ # define optopt __GETOPT_ID (optopt) #endif -#include +#include -#endif /* getopt_pfx_core.h */ +#endif /* _GETOPT_PFX_CORE_H */ diff --git a/lib/getopt_pfx_ext.h b/lib/getopt-pfx-ext.h similarity index 95% rename from lib/getopt_pfx_ext.h rename to lib/getopt-pfx-ext.h index 8c1691ae2e..2f86b23169 100644 --- a/lib/getopt_pfx_ext.h +++ b/lib/getopt-pfx-ext.h @@ -27,7 +27,7 @@ /* Standalone applications should #define __GETOPT_PREFIX to an identifier that prefixes the external functions and variables - defined in getopt_core.h and getopt_ext.h. Systematically + defined in getopt-core.h and getopt-ext.h. Systematically rename identifiers so that they do not collide with the system functions and variables. Renaming avoids problems with some compilers and linkers. */ @@ -59,6 +59,6 @@ # endif #endif -#include +#include -#endif /* getopt_pfx_ext.h */ +#endif /* _GETOPT_PFX_EXT_H */ diff --git a/lib/getopt.in.h b/lib/getopt.in.h index 9f84c27752..bef07e9d83 100644 --- a/lib/getopt.in.h +++ b/lib/getopt.in.h @@ -38,7 +38,7 @@ /* Standalone applications should #define __GETOPT_PREFIX to an identifier that prefixes the external functions and variables - defined in getopt_core.h and getopt_ext.h. When this happens, + defined in getopt-core.h and getopt-ext.h. When this happens, include the headers that might declare getopt so that they will not cause confusion if included after this file (if the system had , we have already included it). */ @@ -54,8 +54,8 @@ /* The definition of _GL_ARG_NONNULL is copied here. */ -#include -#include -#include +#include +#include +#include #endif /* _@GUARD_PREFIX@_GETOPT_H */ diff --git a/lib/unistd.in.h b/lib/unistd.in.h index de619dcca1..d9f741fea5 100644 --- a/lib/unistd.in.h +++ b/lib/unistd.in.h @@ -137,8 +137,8 @@ /* Get getopt(), optarg, optind, opterr, optopt. But avoid namespace pollution on glibc systems. */ #if @GNULIB_UNISTD_H_GETOPT@ && !defined __GLIBC__ && !defined _GL_SYSTEM_GETOPT -# include -# include +# include +# include #endif #ifndef _GL_INLINE_HEADER_BEGIN diff --git a/m4/getopt.m4 b/m4/getopt.m4 index d90076922b..ac3b38e385 100644 --- a/m4/getopt.m4 +++ b/m4/getopt.m4 @@ -1,4 +1,4 @@ -# getopt.m4 serial 45 +# getopt.m4 serial 46 dnl Copyright (C) 2002-2006, 2008-2017 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -364,7 +364,7 @@ AC_DEFUN([gl_GETOPT_SUBSTITUTE_HEADER], [Define to rpl_ if the getopt replacement functions and variables should be used.]) GETOPT_H=getopt.h - GETOPT_CDEFS_H=getopt_cdefs.h + GETOPT_CDEFS_H=getopt-cdefs.h AC_SUBST([GETOPT_H]) AC_SUBST([GETOPT_CDEFS_H]) ]) diff --git a/modules/getopt-posix b/modules/getopt-posix index 220875641c..a7825635af 100644 --- a/modules/getopt-posix +++ b/modules/getopt-posix @@ -5,12 +5,12 @@ Files: lib/getopt.c lib/getopt1.c lib/getopt.in.h -lib/getopt_cdefs.in.h -lib/getopt_core.h -lib/getopt_ext.h +lib/getopt-cdefs.in.h +lib/getopt-core.h +lib/getopt-ext.h +lib/getopt-pfx-core.h +lib/getopt-pfx-ext.h lib/getopt_int.h -lib/getopt_pfx_core.h -lib/getopt_pfx_ext.h m4/getopt.m4 Depends-on: @@ -49,15 +49,15 @@ getopt.h: getopt.in.h $(top_builddir)/config.status } > $@-t && \ mv -f $@-t $@ -getopt_cdefs.h: getopt_cdefs.in.h $(top_builddir)/config.status +getopt-cdefs.h: getopt-cdefs.in.h $(top_builddir)/config.status $(AM_V_GEN)rm -f $@-t $@ && \ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \ sed -e 's|@''HAVE_SYS_CDEFS_H''@|$(HAVE_SYS_CDEFS_H)|g' \ - < $(srcdir)/getopt_cdefs.in.h; \ + < $(srcdir)/getopt-cdefs.in.h; \ } > $@-t && \ mv -f $@-t $@ -MOSTLYCLEANFILES += getopt.h getopt.h-t getopt_cdefs.h getopt_cdefs.h-t +MOSTLYCLEANFILES += getopt.h getopt.h-t getopt-cdefs.h getopt-cdefs.h-t Include: -- 2.39.5