Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
ef0069e9
Commit
ef0069e9
authored
Feb 06, 2011
by
Paul Eggert
Browse files
Merge: gnulib: allow multiple gnulib generated replacements to coexist
parents
ec6ad6f2
59578570
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
2 deletions
+19
-2
ChangeLog
ChangeLog
+5
-0
lib/getopt.in.h
lib/getopt.in.h
+3
-0
lib/time.in.h
lib/time.in.h
+8
-2
lib/unistd.in.h
lib/unistd.in.h
+3
-0
No files found.
ChangeLog
View file @
ef0069e9
2011-02-06 Paul Eggert <eggert@cs.ucla.edu>
gnulib: allow multiple gnulib generated replacements to coexist
This defines a few preprocessor symbols that should not affect Emacs.
* lib/getopt.in.h, lib/time.in.h, lib/unistd.in.h: Regenerate
via "make sync-from-gnulib".
gnulib: undo previous change
The upstream _HEADERS change was backed out of gnulib (see the
same thread). Stay in sync with gnulib.
...
...
lib/getopt.in.h
View file @
ef0069e9
...
...
@@ -181,6 +181,7 @@ extern int optopt;
one). For long options that have a zero `flag' field, `getopt'
returns the contents of the `val' field. */
# if !GNULIB_defined_struct_option
struct
option
{
const
char
*
name
;
...
...
@@ -190,6 +191,8 @@ struct option
int
*
flag
;
int
val
;
};
# define GNULIB_defined_struct_option 1
# endif
/* Names for the values of the `has_arg' field of `struct option'. */
...
...
lib/time.in.h
View file @
ef0069e9
...
...
@@ -69,13 +69,16 @@
extern
"C"
{
# endif
# undef timespec
# define timespec rpl_timespec
# if !GNULIB_defined_struct_timespec
# undef timespec
# define timespec rpl_timespec
struct
timespec
{
time_t
tv_sec
;
long
int
tv_nsec
;
};
# define GNULIB_defined_struct_timespec 1
# endif
# ifdef __cplusplus
}
...
...
@@ -84,6 +87,7 @@ struct timespec
# endif
# endif
# if !GNULIB_defined_struct_time_t_must_be_integral
/* Per http://austingroupbugs.net/view.php?id=327, POSIX requires
time_t to be an integer type, even though C99 permits floating
point. We don't know of any implementation that uses floating
...
...
@@ -92,6 +96,8 @@ struct timespec
struct
__time_t_must_be_integral
{
unsigned
int
__floating_time_t_unsupported
:
(
time_t
)
1
;
};
# define GNULIB_defined_struct_time_t_must_be_integral 1
# endif
/* Sleep for at least RQTP seconds unless interrupted, If interrupted,
return -1 and store the remaining time into RMTP. See
...
...
lib/unistd.in.h
View file @
ef0069e9
...
...
@@ -796,11 +796,14 @@ _GL_CXXALIAS_RPL (getpagesize, int, (void));
# if !(defined __cplusplus && defined GNULIB_NAMESPACE)
# define getpagesize() _gl_getpagesize ()
# else
# if !GNULIB_defined_getpagesize_function
static
inline
int
getpagesize
()
{
return
_gl_getpagesize
();
}
# define GNULIB_defined_getpagesize_function 1
# endif
# endif
# endif
# endif
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment