diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-11-19 16:00:57 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-11-19 16:01:32 -0800 |
| commit | bbd84f86bce9c04ae08d9bccbad19c48e74f3f8b (patch) | |
| tree | 19d511f0e9094149fc61dfe19af992bff0cb03d8 /lib/sys_time.in.h | |
| parent | 493a8f33ba916403d1fab620e08146632b826101 (diff) | |
| download | emacs-bbd84f86bce9c04ae08d9bccbad19c48e74f3f8b.tar.gz | |
Merge from gnulib
This incorporates:
2016-11-15 sys_time: add gnulib::timeval for C++
2016-11-14 snippet/c++defs: fix real-floating arg functions in C++ mode
2016-11-13 strftime: don't use __THROW
2016-11-12 strftime: tune %q
2016-11-12 Merge strftime.c changes from glibc
2016-11-09 manywarnings: fix -Wno-missing-field-initializers detection
2016-11-05 strftime,strptime: support %q to represent the quarter
The glibc changes in turn incorporate the following strftime.c changes:
2015-10-20 Convert misc function definitions to prototype style
2015-09-26 [BZ #18985] out of range data to strftime() causes segfault
2010-01-09 Add support for XPG7 testing
2009-10-30 Implement Burmese language locale for Myanmar
2008-06-13 [BZ #6612] pass reference to tzset_called around
2007-10-16 [BZ #5184] Add tzset_called argument
* build-aux/snippet/c++defs.h, lib/strftime.c, lib/sys_time.in.h:
* m4/manywarnings.m4: Copy from gnulib.
Diffstat (limited to 'lib/sys_time.in.h')
| -rw-r--r-- | lib/sys_time.in.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/sys_time.in.h b/lib/sys_time.in.h index 1623a1dba02..d535a6a48b2 100644 --- a/lib/sys_time.in.h +++ b/lib/sys_time.in.h @@ -109,6 +109,13 @@ _GL_CXXALIAS_SYS_CAST (gettimeofday, int, (struct timeval *restrict, void *restrict)); # endif _GL_CXXALIASWARN (gettimeofday); +# if defined __cplusplus && defined GNULIB_NAMESPACE +namespace GNULIB_NAMESPACE { + typedef ::timeval +#undef timeval + timeval; +} +# endif #elif defined GNULIB_POSIXCHECK # undef gettimeofday # if HAVE_RAW_DECL_GETTIMEOFDAY |