[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 7cc329f: Merge from gnulib
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] master 7cc329f: Merge from gnulib |
Date: |
Sun, 30 Apr 2017 02:11:43 -0400 (EDT) |
branch: master
commit 7cc329fd734992369efd17f6758a732bc5377908
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
Merge from gnulib
This incorporates:
2017-04-29 getopt: port to Solaris 10 with circa-1997 glibc getopt.h
* lib/getopt-pfx-ext.h: Copy from gnulib.
* lib/gnulib.mk.in: Regenerate.
---
lib/getopt-pfx-ext.h | 2 ++
lib/gnulib.mk.in | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/lib/getopt-pfx-ext.h b/lib/getopt-pfx-ext.h
index bc6052a..0839759 100644
--- a/lib/getopt-pfx-ext.h
+++ b/lib/getopt-pfx-ext.h
@@ -40,9 +40,11 @@
# undef getopt_long
# undef getopt_long_only
# undef option
+# undef _getopt_internal
# define getopt_long __GETOPT_ID (getopt_long)
# define getopt_long_only __GETOPT_ID (getopt_long_only)
# define option __GETOPT_ID (option)
+# define _getopt_internal __GETOPT_ID (getopt_internal)
#endif
/* Standalone applications get correct prototypes for getopt_long and
diff --git a/lib/gnulib.mk.in b/lib/gnulib.mk.in
index 08f48c2..4a76f0a 100644
--- a/lib/gnulib.mk.in
+++ b/lib/gnulib.mk.in
@@ -431,6 +431,7 @@ HAVE_MKOSTEMP = @HAVE_MKOSTEMP@
HAVE_MKOSTEMPS = @HAVE_MKOSTEMPS@
HAVE_MKSTEMP = @HAVE_MKSTEMP@
HAVE_MKSTEMPS = @HAVE_MKSTEMPS@
+HAVE_MODULES = @HAVE_MODULES@
HAVE_NANOSLEEP = @HAVE_NANOSLEEP@
HAVE_OPENAT = @HAVE_OPENAT@
HAVE_OPENDIR = @HAVE_OPENDIR@
@@ -592,6 +593,7 @@ MAKEINFO = @MAKEINFO@
MAKE_PROG = @MAKE_PROG@
MKDIR_P = @MKDIR_P@
MODULES_OBJ = @MODULES_OBJ@
+MODULES_SUFFIX = @MODULES_SUFFIX@
NEXT_AS_FIRST_DIRECTIVE_DIRENT_H = @NEXT_AS_FIRST_DIRECTIVE_DIRENT_H@
NEXT_AS_FIRST_DIRECTIVE_ERRNO_H = @NEXT_AS_FIRST_DIRECTIVE_ERRNO_H@
NEXT_AS_FIRST_DIRECTIVE_FCNTL_H = @NEXT_AS_FIRST_DIRECTIVE_FCNTL_H@
@@ -922,7 +924,6 @@ pdfdir = @pdfdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
-runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 7cc329f: Merge from gnulib,
Paul Eggert <=