mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-17 03:10:58 -08:00
Code Issues Projects Releases Wiki Activity

Merge from gnulib.

Browse source 
This incorporates:
2013-03-12 mktime: fix configure typo
2013-03-11 regex: port to mingw's recent addition of undeclared alarm
2013-03-11 putenv: avoid compilation warning on mingw
2013-03-11 unistd: don't prevent Tru64 Unix from using gnulib strtod.
This commit is contained in:
Paul Eggert 2013-03-12 17:38:42 -07:00
parent 84c3ab6860
commit 5615c9a9af
4 changed files with 57 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
2013-03-13 Paul Eggert <eggert@cs.ucla.edu>
Merge from gnulib, incorporating:
2013-03-12 mktime: fix configure typo
2013-03-11 regex: port to mingw's recent addition of undeclared alarm
2013-03-11 putenv: avoid compilation warning on mingw
2013-03-11 unistd: don't prevent Tru64 Unix from using gnulib strtod.
2013-03-06 Paul Eggert <eggert@cs.ucla.edu> 2013-03-06 Paul Eggert <eggert@cs.ucla.edu>
* configure.ac (TERM_HEADER): Remove duplicate definition (Bug#13872). * configure.ac (TERM_HEADER): Remove duplicate definition (Bug#13872).

2
lib/putenv.c
View file

@ -62,7 +62,9 @@ static int
_unsetenv (const char *name) _unsetenv (const char *name)
{ {
size_t len; size_t len;
#if !HAVE__PUTENV
char **ep; char **ep;
#endif
if (name == NULL || *name == '\0' || strchr (name, '=') != NULL) if (name == NULL || *name == '\0' || strchr (name, '=') != NULL)
{ {

4
lib/unistd.in.h
View file

@ -61,8 +61,10 @@
/* mingw, MSVC, BeOS, Haiku declare environ in <stdlib.h>, not in /* mingw, MSVC, BeOS, Haiku declare environ in <stdlib.h>, not in
<unistd.h>. */ <unistd.h>. */
/* Solaris declares getcwd not only in <unistd.h> but also in <stdlib.h>. */ /* Solaris declares getcwd not only in <unistd.h> but also in <stdlib.h>. */
/* OSF Tru64 Unix cannot see gnulib rpl_strtod when system <stdlib.h> is
included here. */
/* But avoid namespace pollution on glibc systems. */ /* But avoid namespace pollution on glibc systems. */
#ifndef __GLIBC__ #if !defined __GLIBC__ && !defined __osf__
# define __need_system_stdlib_h # define __need_system_stdlib_h
# include <stdlib.h> # include <stdlib.h>
# undef __need_system_stdlib_h # undef __need_system_stdlib_h

11
m4/mktime.m4
View file

@ -1,4 +1,4 @@
# serial 24 # serial 25
dnl Copyright (C) 2002-2003, 2005-2007, 2009-2013 Free Software Foundation, dnl Copyright (C) 2002-2003, 2005-2007, 2009-2013 Free Software Foundation,
dnl Inc. dnl Inc.
dnl This file is free software; the Free Software Foundation dnl This file is free software; the Free Software Foundation
@ -14,7 +14,7 @@ AC_DEFUN([gl_FUNC_MKTIME],
dnl We don't use AC_FUNC_MKTIME any more, because it is no longer maintained dnl We don't use AC_FUNC_MKTIME any more, because it is no longer maintained
dnl in Autoconf and because it invokes AC_LIBOBJ. dnl in Autoconf and because it invokes AC_LIBOBJ.
AC_CHECK_HEADERS_ONCE([unistd.h]) AC_CHECK_HEADERS_ONCE([unistd.h])
AC_CHECK_FUNCS_ONCE([alarm]) AC_CHECK_DECLS_ONCE([alarm])
AC_REQUIRE([gl_MULTIARCH]) AC_REQUIRE([gl_MULTIARCH])
if test $APPLE_UNIVERSAL_BUILD = 1; then if test $APPLE_UNIVERSAL_BUILD = 1; then
# A universal build on Apple Mac OS X platforms. # A universal build on Apple Mac OS X platforms.
@ -34,8 +34,8 @@ AC_DEFUN([gl_FUNC_MKTIME],
# include <unistd.h> # include <unistd.h>
#endif #endif
#ifndef HAVE_ALARM #if HAVE_DECL_ALARM
# define alarm(X) /* empty */ # include <signal.h>
#endif #endif
/* Work around redefinition to rpl_putenv by other config tests. */ /* Work around redefinition to rpl_putenv by other config tests. */
@ -171,10 +171,13 @@ main ()
int time_t_signed_magnitude = (time_t) ~ (time_t) 0 < (time_t) -1; int time_t_signed_magnitude = (time_t) ~ (time_t) 0 < (time_t) -1;
int time_t_signed = ! ((time_t) 0 < (time_t) -1); int time_t_signed = ! ((time_t) 0 < (time_t) -1);
#if HAVE_DECL_ALARM
/* This test makes some buggy mktime implementations loop. /* This test makes some buggy mktime implementations loop.
Give up after 60 seconds; a mktime slower than that Give up after 60 seconds; a mktime slower than that
isn't worth using anyway. */ isn't worth using anyway. */
signal (SIGALRM, SIG_DFL);
alarm (60); alarm (60);
#endif
time_t_max = (! time_t_signed time_t_max = (! time_t_signed
? (time_t) -1 ? (time_t) -1