mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-11 16:08:13 +00:00
Code Issues Releases Activity

Sync with gnulib

Browse Source 
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.
This commit is contained in:
Paul Eggert 2016-03-15 13:20:29 -07:00
parent 38b276d162
commit ba33b7c412
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/sys_select.in.h
View File

@ -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@

6
lib/time_rz.c
View File

@ -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