Commit ffc927ee authored by Paul Eggert's avatar 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.
parent 4172365d
2017-04-08 Paul Eggert <eggert@cs.ucla.edu>
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
......@@ -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 */
......@@ -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 */
......@@ -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 */
......@@ -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 <getopt_core.h>
#include <getopt-core.h>
#endif /* getopt_pfx_core.h */
#endif /* _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. */
......@@ -59,6 +59,6 @@
# endif
#endif
#include <getopt_ext.h>
#include <getopt-ext.h>
#endif /* getopt_pfx_ext.h */
#endif /* _GETOPT_PFX_EXT_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
<getopt.h>, we have already included it). */
......@@ -54,8 +54,8 @@
/* The definition of _GL_ARG_NONNULL is copied here. */
#include <getopt_cdefs.h>
#include <getopt_pfx_core.h>
#include <getopt_pfx_ext.h>
#include <getopt-cdefs.h>
#include <getopt-pfx-core.h>
#include <getopt-pfx-ext.h>
#endif /* _@GUARD_PREFIX@_GETOPT_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 <getopt_cdefs.h>
# include <getopt_pfx_core.h>
# include <getopt-cdefs.h>
# include <getopt-pfx-core.h>
#endif
#ifndef _GL_INLINE_HEADER_BEGIN
......
# 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])
])
......@@ -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:
<unistd.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment