diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-03-15 13:20:29 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-03-15 13:20:55 -0700 |
| commit | ba33b7c412158697f206a37ea66fab296b094e88 (patch) | |
| tree | 7527b5b0dad6911cf57fbe51833195184d988e11 /lib | |
| parent | 38b276d162197a5ca4bd7322ff8a823c3754edb4 (diff) | |
Sync with gnulib
This incorporates:
2016-03-15 time_rz: port to clang -Wunused-const-variable
2016-03-15 select: port more to Intel 2016.1.150 compiler
* lib/sys_select.in.h, lib/time_rz.c: Copy from gnulib.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sys_select.in.h | 9 | ||||
| -rw-r--r-- | lib/time_rz.c | 6 |
2 files changed, 8 insertions, 7 deletions
diff --git a/lib/sys_select.in.h b/lib/sys_select.in.h index f7b260d2ad..a557e04ab5 100644 --- a/lib/sys_select.in.h +++ b/lib/sys_select.in.h @@ -289,12 +289,15 @@ _GL_WARN_ON_USE (pselect, "pselect is not portable - " # define select rpl_select # endif _GL_FUNCDECL_RPL (select, int, - (int, fd_set *, fd_set *, fd_set *, struct timeval *)); + (int, fd_set *restrict, fd_set *restrict, fd_set *restrict, + struct timeval *restrict)); _GL_CXXALIAS_RPL (select, int, - (int, fd_set *, fd_set *, fd_set *, struct timeval *)); + (int, fd_set *restrict, fd_set *restrict, fd_set *restrict, + struct timeval *restrict)); # else _GL_CXXALIAS_SYS (select, int, - (int, fd_set *, fd_set *, fd_set *, struct timeval *)); + (int, fd_set *restrict, fd_set *restrict, fd_set *restrict, + struct timeval *restrict)); # endif _GL_CXXALIASWARN (select); #elif @HAVE_WINSOCK2_H@ diff --git a/lib/time_rz.c b/lib/time_rz.c index bc801275b6..55b764ea8b 100644 --- a/lib/time_rz.c +++ b/lib/time_rz.c @@ -47,8 +47,6 @@ enum { DEFAULT_MXFAST = 64 * sizeof (size_t) / 4 }; used. */ enum { ABBR_SIZE_MIN = DEFAULT_MXFAST - offsetof (struct tm_zone, abbrs) }; -static char const TZ[] = "TZ"; - /* Magic cookie timezone_t value, for local time. It differs from NULL and from all other timezone_t values. Only the address matters; the pointer is never dereferenced. */ @@ -205,7 +203,7 @@ tzfree (timezone_t tz) static char * getenv_TZ (void) { - return getenv (TZ); + return getenv ("TZ"); } #endif @@ -213,7 +211,7 @@ getenv_TZ (void) static int setenv_TZ (char const *tz) { - return tz ? setenv (TZ, tz, 1) : unsetenv (TZ); + return tz ? setenv ("TZ", tz, 1) : unsetenv ("TZ"); } #endif |