diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-02-06 17:01:26 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-02-06 17:01:26 -0800 |
| commit | 595785701d1fe44d8abac5a1454f2468a0482bf0 (patch) | |
| tree | a64680a308c1824001e0d6f92be804992d70e629 /lib/time.in.h | |
| parent | c5aff743c3963a8fdaab628d2b695df50432e0de (diff) | |
| download | emacs-595785701d1fe44d8abac5a1454f2468a0482bf0.tar.gz | |
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".
Diffstat (limited to 'lib/time.in.h')
| -rw-r--r-- | lib/time.in.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/lib/time.in.h b/lib/time.in.h index 2d6da7161fb..cb533a46e10 100644 --- a/lib/time.in.h +++ b/lib/time.in.h @@ -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 |