aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2016-03-15 13:20:29 -0700
committerPaul Eggert2016-03-15 13:20:55 -0700
commitba33b7c412158697f206a37ea66fab296b094e88 (patch)
tree7527b5b0dad6911cf57fbe51833195184d988e11
parent38b276d162197a5ca4bd7322ff8a823c3754edb4 (diff)
downloademacs-ba33b7c412158697f206a37ea66fab296b094e88.tar.gz
emacs-ba33b7c412158697f206a37ea66fab296b094e88.zip
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.
-rw-r--r--lib/sys_select.in.h9
-rw-r--r--lib/time_rz.c6
2 files changed, 8 insertions, 7 deletions
diff --git a/lib/sys_select.in.h b/lib/sys_select.in.h
index f7b260d2ad5..a557e04ab5d 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 - "
289# define select rpl_select 289# define select rpl_select
290# endif 290# endif
291_GL_FUNCDECL_RPL (select, int, 291_GL_FUNCDECL_RPL (select, int,
292 (int, fd_set *, fd_set *, fd_set *, struct timeval *)); 292 (int, fd_set *restrict, fd_set *restrict, fd_set *restrict,
293 struct timeval *restrict));
293_GL_CXXALIAS_RPL (select, int, 294_GL_CXXALIAS_RPL (select, int,
294 (int, fd_set *, fd_set *, fd_set *, struct timeval *)); 295 (int, fd_set *restrict, fd_set *restrict, fd_set *restrict,
296 struct timeval *restrict));
295# else 297# else
296_GL_CXXALIAS_SYS (select, int, 298_GL_CXXALIAS_SYS (select, int,
297 (int, fd_set *, fd_set *, fd_set *, struct timeval *)); 299 (int, fd_set *restrict, fd_set *restrict, fd_set *restrict,
300 struct timeval *restrict));
298# endif 301# endif
299_GL_CXXALIASWARN (select); 302_GL_CXXALIASWARN (select);
300#elif @HAVE_WINSOCK2_H@ 303#elif @HAVE_WINSOCK2_H@
diff --git a/lib/time_rz.c b/lib/time_rz.c
index bc801275b6d..55b764ea8b3 100644
--- a/lib/time_rz.c
+++ b/lib/time_rz.c
@@ -47,8 +47,6 @@ enum { DEFAULT_MXFAST = 64 * sizeof (size_t) / 4 };
47 used. */ 47 used. */
48enum { ABBR_SIZE_MIN = DEFAULT_MXFAST - offsetof (struct tm_zone, abbrs) }; 48enum { ABBR_SIZE_MIN = DEFAULT_MXFAST - offsetof (struct tm_zone, abbrs) };
49 49
50static char const TZ[] = "TZ";
51
52/* Magic cookie timezone_t value, for local time. It differs from 50/* Magic cookie timezone_t value, for local time. It differs from
53 NULL and from all other timezone_t values. Only the address 51 NULL and from all other timezone_t values. Only the address
54 matters; the pointer is never dereferenced. */ 52 matters; the pointer is never dereferenced. */
@@ -205,7 +203,7 @@ tzfree (timezone_t tz)
205static char * 203static char *
206getenv_TZ (void) 204getenv_TZ (void)
207{ 205{
208 return getenv (TZ); 206 return getenv ("TZ");
209} 207}
210#endif 208#endif
211 209
@@ -213,7 +211,7 @@ getenv_TZ (void)
213static int 211static int
214setenv_TZ (char const *tz) 212setenv_TZ (char const *tz)
215{ 213{
216 return tz ? setenv (TZ, tz, 1) : unsetenv (TZ); 214 return tz ? setenv ("TZ", tz, 1) : unsetenv ("TZ");
217} 215}
218#endif 216#endif
219 217