diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2014-03-07 10:57:11 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2014-03-07 10:57:11 -0800 |
| commit | 0d181095652bf8e1ca27935e54ecbb5443496334 (patch) | |
| tree | 5bf9307c53f29af1a493e42308887ce26785c5b3 /m4 | |
| parent | d67d60a2eab5f7f1f9b1d31cd1c7dd1e31bb4d2b (diff) | |
| download | emacs-0d181095652bf8e1ca27935e54ecbb5443496334.tar.gz | |
Merge from gnulib.
This incorporates:
2014-03-04 stdint: fix missing SIZE_MAX on Android
2013-03-02 sys_types: avoid autoconf warning about gl_SYS_TYPES_H
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* lib/stdint.in.h, lib/sys_types.in.h, m4/sys_types_h.m4:
Update from gnulib.
Fix oversight preventing lib/sys/types.h from being generated.
* admin/merge-gnulib (GNULIB_TOOL_FLAGS): Don't avoid sys_types.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/gnulib-comp.m4 | 5 | ||||
| -rw-r--r-- | m4/sys_types_h.m4 | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 index 52fa116b93d..0ba2d7950af 100644 --- a/m4/gnulib-comp.m4 +++ b/m4/gnulib-comp.m4 @@ -140,6 +140,7 @@ AC_DEFUN([gl_EARLY], # Code from module sys_select: # Code from module sys_stat: # Code from module sys_time: + # Code from module sys_types: # Code from module tempname: # Code from module time: # Code from module time_r: @@ -372,6 +373,8 @@ AC_DEFUN([gl_INIT], AC_PROG_MKDIR_P gl_HEADER_SYS_TIME_H AC_PROG_MKDIR_P + gl_SYS_TYPES_H + AC_PROG_MKDIR_P gl_HEADER_TIME_H gl_TIME_R if test $HAVE_LOCALTIME_R = 0 || test $REPLACE_LOCALTIME_R = 1; then @@ -907,6 +910,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/sys_select.in.h lib/sys_stat.in.h lib/sys_time.in.h + lib/sys_types.in.h lib/tempname.c lib/tempname.h lib/time.in.h @@ -1011,6 +1015,7 @@ AC_DEFUN([gl_FILE_LIST], [ m4/sys_socket_h.m4 m4/sys_stat_h.m4 m4/sys_time_h.m4 + m4/sys_types_h.m4 m4/tempname.m4 m4/time_h.m4 m4/time_r.m4 diff --git a/m4/sys_types_h.m4 b/m4/sys_types_h.m4 index 48921846a68..9748905b598 100644 --- a/m4/sys_types_h.m4 +++ b/m4/sys_types_h.m4 @@ -1,10 +1,10 @@ -# sys_types_h.m4 serial 4 +# sys_types_h.m4 serial 5 dnl Copyright (C) 2011-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. -AC_DEFUN([gl_SYS_TYPES_H], +AC_DEFUN_ONCE([gl_SYS_TYPES_H], [ AC_REQUIRE([gl_SYS_TYPES_H_DEFAULTS]) gl_NEXT_HEADERS([sys/types.h]) |