diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2012-11-30 10:25:59 -0800 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-11-30 10:25:59 -0800 |
commit | f64898abf40b09990c4974c921ddc2ebc698609a (patch) | |
tree | 45707f0fd85ef6da1c94832b9af8290b2ad0d5d2 /m4 | |
parent | f8aff4c6b87598697d7fc67063037ac69f1c9421 (diff) | |
download | emacs-f64898abf40b09990c4974c921ddc2ebc698609a.tar.gz |
Merge from gnulib for 'inline'.
2012-11-29 snippet/warn-on-use: no 'static inline'
2012-11-29 ftruncate, fts, lstat, openat, raise: no 'static inline'
2012-11-29 arctwo, md4, md5, sha1, sha256, sha512: no 'static inline'
2012-11-29 fflush, stat: no 'static inline'
2012-11-29 stdio: better 'inline'
2012-11-29 sys_stat: no 'static inline'
2012-11-29 unistd: better 'inline'
2012-11-29 c-strtod, memcoll, readutmp: no 'static inline'
2012-11-29 extern-inline: no 'static inline'
2012-11-29 sys_socket: better 'inline'
* lib/stdio.c, lib/unistd.c: New files, from gnulib.
* build-aux/snippet/warn-on-use.h, lib/gnulib.mk, lib/lstat.c:
* lib/md5.c, lib/sha1.c, lib/sha256.c, lib/sha512.c, lib/stat.c:
* lib/stdio.in.h, lib/sys_stat.in.h, lib/unistd.in.h, m4/c-strtod.m4:
* m4/extern-inline.m4, m4/gnulib-comp.m4, m4/lstat.m4, m4/md5.m4:
* m4/sha1.m4, m4/sha256.m4, m4/sha512.m4, m4/stat.m4, m4/stdio_h.m4:
* m4/sys_socket_h.m4, m4/sys_stat_h.m4, m4/unistd_h.m4:
Update from gnulib.
Fixes: debbugs:13040
Diffstat (limited to 'm4')
-rw-r--r-- | m4/c-strtod.m4 | 8 | ||||
-rw-r--r-- | m4/extern-inline.m4 | 5 | ||||
-rw-r--r-- | m4/gnulib-comp.m4 | 2 | ||||
-rw-r--r-- | m4/lstat.m4 | 8 | ||||
-rw-r--r-- | m4/md5.m4 | 3 | ||||
-rw-r--r-- | m4/sha1.m4 | 3 | ||||
-rw-r--r-- | m4/sha256.m4 | 3 | ||||
-rw-r--r-- | m4/sha512.m4 | 3 | ||||
-rw-r--r-- | m4/stat.m4 | 8 | ||||
-rw-r--r-- | m4/stdio_h.m4 | 3 | ||||
-rw-r--r-- | m4/sys_socket_h.m4 | 3 | ||||
-rw-r--r-- | m4/sys_stat_h.m4 | 5 | ||||
-rw-r--r-- | m4/unistd_h.m4 | 3 |
13 files changed, 17 insertions, 40 deletions
diff --git a/m4/c-strtod.m4 b/m4/c-strtod.m4 index c002e5fcead..535721c8dbc 100644 --- a/m4/c-strtod.m4 +++ b/m4/c-strtod.m4 @@ -1,4 +1,4 @@ -# c-strtod.m4 serial 14 +# c-strtod.m4 serial 15 # Copyright (C) 2004-2006, 2009-2012 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation @@ -38,9 +38,6 @@ AC_DEFUN([gl_C_STRTOD], [ AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) AC_CHECK_FUNCS([strtod_l]) - - AC_REQUIRE([AC_C_INLINE]) - : ]) dnl Prerequisites of lib/c-strtold.c. @@ -49,7 +46,4 @@ AC_DEFUN([gl_C_STRTOLD], AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) AC_REQUIRE([gl_C99_STRTOLD]) AC_CHECK_FUNCS([strtold_l]) - - AC_REQUIRE([AC_C_INLINE]) - : ]) diff --git a/m4/extern-inline.m4 b/m4/extern-inline.m4 index 600c8d3fa17..24922605e64 100644 --- a/m4/extern-inline.m4 +++ b/m4/extern-inline.m4 @@ -7,7 +7,6 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_EXTERN_INLINE], [ - AC_REQUIRE([AC_C_INLINE]) AH_VERBATIM([extern_inline], [/* _GL_INLINE is a portable alternative to ISO C99 plain 'inline'. _GL_EXTERN_INLINE is a portable alternative to 'extern inline'. @@ -32,8 +31,8 @@ AC_DEFUN([gl_EXTERN_INLINE], # endif # define _GL_EXTERN_INLINE extern #else -# define _GL_INLINE static inline -# define _GL_EXTERN_INLINE static inline +# define _GL_INLINE static +# define _GL_EXTERN_INLINE static #endif #if 4 < __GNUC__ + (6 <= __GNUC_MINOR__) diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 index 30f81b4781f..1d09eb8ef92 100644 --- a/m4/gnulib-comp.m4 +++ b/m4/gnulib-comp.m4 @@ -690,6 +690,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/stdbool.in.h lib/stddef.in.h lib/stdint.in.h + lib/stdio.c lib/stdio.in.h lib/stdlib.in.h lib/strftime.c @@ -712,6 +713,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/timespec.h lib/u64.c lib/u64.h + lib/unistd.c lib/unistd.in.h lib/utimens.c lib/utimens.h diff --git a/m4/lstat.m4 b/m4/lstat.m4 index b7335bda1b2..01b4eb953d5 100644 --- a/m4/lstat.m4 +++ b/m4/lstat.m4 @@ -1,4 +1,4 @@ -# serial 25 +# serial 26 # Copyright (C) 1997-2001, 2003-2012 Free Software Foundation, Inc. # @@ -27,11 +27,7 @@ AC_DEFUN([gl_FUNC_LSTAT], ]) # Prerequisites of lib/lstat.c. -AC_DEFUN([gl_PREREQ_LSTAT], -[ - AC_REQUIRE([AC_C_INLINE]) - : -]) +AC_DEFUN([gl_PREREQ_LSTAT], [:]) AC_DEFUN([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK], [ diff --git a/m4/md5.m4 b/m4/md5.m4 index e22f7bdb17a..85ed8946068 100644 --- a/m4/md5.m4 +++ b/m4/md5.m4 @@ -1,4 +1,4 @@ -# md5.m4 serial 12 +# md5.m4 serial 13 dnl Copyright (C) 2002-2006, 2008-2012 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -8,6 +8,5 @@ AC_DEFUN([gl_MD5], [ dnl Prerequisites of lib/md5.c. AC_REQUIRE([gl_BIGENDIAN]) - AC_REQUIRE([AC_C_INLINE]) : ]) diff --git a/m4/sha1.m4 b/m4/sha1.m4 index 76198258b92..29fa4850341 100644 --- a/m4/sha1.m4 +++ b/m4/sha1.m4 @@ -1,4 +1,4 @@ -# sha1.m4 serial 10 +# sha1.m4 serial 11 dnl Copyright (C) 2002-2006, 2008-2012 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -8,6 +8,5 @@ AC_DEFUN([gl_SHA1], [ dnl Prerequisites of lib/sha1.c. AC_REQUIRE([gl_BIGENDIAN]) - AC_REQUIRE([AC_C_INLINE]) : ]) diff --git a/m4/sha256.m4 b/m4/sha256.m4 index 78cc95ed8b6..f75a7fb9e07 100644 --- a/m4/sha256.m4 +++ b/m4/sha256.m4 @@ -1,4 +1,4 @@ -# sha256.m4 serial 5 +# sha256.m4 serial 6 dnl Copyright (C) 2005, 2008-2012 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -8,5 +8,4 @@ AC_DEFUN([gl_SHA256], [ dnl Prerequisites of lib/sha256.c. AC_REQUIRE([gl_BIGENDIAN]) - AC_REQUIRE([AC_C_INLINE]) ]) diff --git a/m4/sha512.m4 b/m4/sha512.m4 index 937ea8d5e9d..e6e27393d7d 100644 --- a/m4/sha512.m4 +++ b/m4/sha512.m4 @@ -1,4 +1,4 @@ -# sha512.m4 serial 6 +# sha512.m4 serial 7 dnl Copyright (C) 2005-2006, 2008-2012 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -8,5 +8,4 @@ AC_DEFUN([gl_SHA512], [ dnl Prerequisites of lib/sha512.c. AC_REQUIRE([gl_BIGENDIAN]) - AC_REQUIRE([AC_C_INLINE]) ]) diff --git a/m4/stat.m4 b/m4/stat.m4 index a8b79f5bcba..0fd117e05eb 100644 --- a/m4/stat.m4 +++ b/m4/stat.m4 @@ -1,4 +1,4 @@ -# serial 10 +# serial 11 # Copyright (C) 2009-2012 Free Software Foundation, Inc. # @@ -68,8 +68,4 @@ AC_DEFUN([gl_FUNC_STAT], ]) # Prerequisites of lib/stat.c. -AC_DEFUN([gl_PREREQ_STAT], -[ - AC_REQUIRE([AC_C_INLINE]) - : -]) +AC_DEFUN([gl_PREREQ_STAT], [:]) diff --git a/m4/stdio_h.m4 b/m4/stdio_h.m4 index 5298dd6d9d5..3bd65803667 100644 --- a/m4/stdio_h.m4 +++ b/m4/stdio_h.m4 @@ -1,4 +1,4 @@ -# stdio_h.m4 serial 42 +# stdio_h.m4 serial 43 dnl Copyright (C) 2007-2012 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -7,7 +7,6 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_STDIO_H], [ AC_REQUIRE([gl_STDIO_H_DEFAULTS]) - AC_REQUIRE([AC_C_INLINE]) gl_NEXT_HEADERS([stdio.h]) dnl No need to create extra modules for these functions. Everyone who uses diff --git a/m4/sys_socket_h.m4 b/m4/sys_socket_h.m4 index 8d4e7e1ebb4..acfae413283 100644 --- a/m4/sys_socket_h.m4 +++ b/m4/sys_socket_h.m4 @@ -1,4 +1,4 @@ -# sys_socket_h.m4 serial 22 +# sys_socket_h.m4 serial 23 dnl Copyright (C) 2005-2012 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -10,7 +10,6 @@ AC_DEFUN([gl_HEADER_SYS_SOCKET], [ AC_REQUIRE([gl_SYS_SOCKET_H_DEFAULTS]) AC_REQUIRE([AC_CANONICAL_HOST]) - AC_REQUIRE([AC_C_INLINE]) dnl On OSF/1, the functions recv(), send(), recvfrom(), sendto() have dnl old-style declarations (with return type 'int' instead of 'ssize_t') diff --git a/m4/sys_stat_h.m4 b/m4/sys_stat_h.m4 index f45dee1dc4d..8af3353ea51 100644 --- a/m4/sys_stat_h.m4 +++ b/m4/sys_stat_h.m4 @@ -1,4 +1,4 @@ -# sys_stat_h.m4 serial 27 -*- Autoconf -*- +# sys_stat_h.m4 serial 28 -*- Autoconf -*- dnl Copyright (C) 2006-2012 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -11,9 +11,6 @@ AC_DEFUN([gl_HEADER_SYS_STAT_H], [ AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS]) - dnl For the mkdir substitute. - AC_REQUIRE([AC_C_INLINE]) - dnl Check for broken stat macros. AC_REQUIRE([AC_HEADER_STAT]) diff --git a/m4/unistd_h.m4 b/m4/unistd_h.m4 index 7e7651b9d2e..f68fbff8cef 100644 --- a/m4/unistd_h.m4 +++ b/m4/unistd_h.m4 @@ -1,4 +1,4 @@ -# unistd_h.m4 serial 65 +# unistd_h.m4 serial 66 dnl Copyright (C) 2006-2012 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -11,7 +11,6 @@ AC_DEFUN([gl_UNISTD_H], dnl Use AC_REQUIRE here, so that the default behavior below is expanded dnl once only, before all statements that occur in other macros. AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) - AC_REQUIRE([AC_C_INLINE]) gl_CHECK_NEXT_HEADERS([unistd.h]) if test $ac_cv_header_unistd_h = yes; then |