Commit f64898ab authored by Paul Eggert's avatar Paul Eggert

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
parent f8aff4c6
2012-11-30 Paul Eggert <eggert@cs.ucla.edu>
Merge from gnulib for 'inline' (Bug#13040), incorporating:
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.
2012-11-27 Eli Zaretskii <eliz@gnu.org> 2012-11-27 Eli Zaretskii <eliz@gnu.org>
* make-dist (nt): Adjust to changes in names of the *.manifest files. * make-dist (nt): Adjust to changes in names of the *.manifest files.
......
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
rather than issue the nice warning, but the end result of informing rather than issue the nice warning, but the end result of informing
the developer about their portability problem is still achieved): the developer about their portability problem is still achieved):
#if HAVE_RAW_DECL_ENVIRON #if HAVE_RAW_DECL_ENVIRON
static inline char ***rpl_environ (void) { return &environ; } static char ***rpl_environ (void) { return &environ; }
_GL_WARN_ON_USE (rpl_environ, "environ is not always properly declared"); _GL_WARN_ON_USE (rpl_environ, "environ is not always properly declared");
# undef environ # undef environ
# define environ (*rpl_environ ()) # define environ (*rpl_environ ())
......
...@@ -756,6 +756,7 @@ EXTRA_DIST += stdint.in.h ...@@ -756,6 +756,7 @@ EXTRA_DIST += stdint.in.h
## begin gnulib module stdio ## begin gnulib module stdio
BUILT_SOURCES += stdio.h BUILT_SOURCES += stdio.h
libgnu_a_SOURCES += stdio.c
# We need the following in order to create <stdio.h> when the system # We need the following in order to create <stdio.h> when the system
# doesn't have one that works with the given compiler. # doesn't have one that works with the given compiler.
...@@ -1251,6 +1252,7 @@ EXTRA_DIST += u64.h ...@@ -1251,6 +1252,7 @@ EXTRA_DIST += u64.h
## begin gnulib module unistd ## begin gnulib module unistd
BUILT_SOURCES += unistd.h BUILT_SOURCES += unistd.h
libgnu_a_SOURCES += unistd.c
# We need the following in order to create an empty placeholder for # We need the following in order to create an empty placeholder for
# <unistd.h> when the system doesn't have one. # <unistd.h> when the system doesn't have one.
......
...@@ -35,7 +35,7 @@ typedef int dummy; ...@@ -35,7 +35,7 @@ typedef int dummy;
# include <sys/stat.h> # include <sys/stat.h>
# undef __need_system_sys_stat_h # undef __need_system_sys_stat_h
static inline int static int
orig_lstat (const char *filename, struct stat *buf) orig_lstat (const char *filename, struct stat *buf)
{ {
return lstat (filename, buf); return lstat (filename, buf);
......
...@@ -83,7 +83,7 @@ md5_init_ctx (struct md5_ctx *ctx) ...@@ -83,7 +83,7 @@ md5_init_ctx (struct md5_ctx *ctx)
/* Copy the 4 byte value from v into the memory location pointed to by *cp, /* Copy the 4 byte value from v into the memory location pointed to by *cp,
If your architecture allows unaligned access this is equivalent to If your architecture allows unaligned access this is equivalent to
* (uint32_t *) cp = v */ * (uint32_t *) cp = v */
static inline void static void
set_uint32 (char *cp, uint32_t v) set_uint32 (char *cp, uint32_t v)
{ {
memcpy (cp, &v, sizeof v); memcpy (cp, &v, sizeof v);
......
...@@ -70,7 +70,7 @@ sha1_init_ctx (struct sha1_ctx *ctx) ...@@ -70,7 +70,7 @@ sha1_init_ctx (struct sha1_ctx *ctx)
/* Copy the 4 byte value from v into the memory location pointed to by *cp, /* Copy the 4 byte value from v into the memory location pointed to by *cp,
If your architecture allows unaligned access this is equivalent to If your architecture allows unaligned access this is equivalent to
* (uint32_t *) cp = v */ * (uint32_t *) cp = v */
static inline void static void
set_uint32 (char *cp, uint32_t v) set_uint32 (char *cp, uint32_t v)
{ {
memcpy (cp, &v, sizeof v); memcpy (cp, &v, sizeof v);
......
...@@ -90,7 +90,7 @@ sha224_init_ctx (struct sha256_ctx *ctx) ...@@ -90,7 +90,7 @@ sha224_init_ctx (struct sha256_ctx *ctx)
/* Copy the value from v into the memory location pointed to by *cp, /* Copy the value from v into the memory location pointed to by *cp,
If your architecture allows unaligned access this is equivalent to If your architecture allows unaligned access this is equivalent to
* (uint32_t *) cp = v */ * (uint32_t *) cp = v */
static inline void static void
set_uint32 (char *cp, uint32_t v) set_uint32 (char *cp, uint32_t v)
{ {
memcpy (cp, &v, sizeof v); memcpy (cp, &v, sizeof v);
......
...@@ -97,7 +97,7 @@ sha384_init_ctx (struct sha512_ctx *ctx) ...@@ -97,7 +97,7 @@ sha384_init_ctx (struct sha512_ctx *ctx)
/* Copy the value from V into the memory location pointed to by *CP, /* Copy the value from V into the memory location pointed to by *CP,
If your architecture allows unaligned access, this is equivalent to If your architecture allows unaligned access, this is equivalent to
* (__typeof__ (v) *) cp = v */ * (__typeof__ (v) *) cp = v */
static inline void static void
set_uint64 (char *cp, u64 v) set_uint64 (char *cp, u64 v)
{ {
memcpy (cp, &v, sizeof v); memcpy (cp, &v, sizeof v);
......
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
# endif # endif
#endif #endif
static inline int static int
orig_stat (const char *filename, struct stat *buf) orig_stat (const char *filename, struct stat *buf)
{ {
return stat (filename, buf); return stat (filename, buf);
......
#include <config.h>
#define _GL_STDIO_INLINE _GL_EXTERN_INLINE
#include "stdio.h"
...@@ -46,6 +46,11 @@ ...@@ -46,6 +46,11 @@
#ifndef _@GUARD_PREFIX@_STDIO_H #ifndef _@GUARD_PREFIX@_STDIO_H
#define _@GUARD_PREFIX@_STDIO_H #define _@GUARD_PREFIX@_STDIO_H
_GL_INLINE_HEADER_BEGIN
#ifndef _GL_STDIO_INLINE
# define _GL_STDIO_INLINE _GL_INLINE
#endif
/* Get va_list. Needed on many systems, including glibc 2.8. */ /* Get va_list. Needed on many systems, including glibc 2.8. */
#include <stdarg.h> #include <stdarg.h>
...@@ -581,7 +586,7 @@ _GL_CXXALIAS_SYS (fwrite, size_t, ...@@ -581,7 +586,7 @@ _GL_CXXALIAS_SYS (fwrite, size_t,
This affects only function declaration attributes, so it's not This affects only function declaration attributes, so it's not
needed for C++. */ needed for C++. */
# if !defined __cplusplus && 0 < __USE_FORTIFY_LEVEL # if !defined __cplusplus && 0 < __USE_FORTIFY_LEVEL
static inline size_t _GL_ARG_NONNULL ((1, 4)) _GL_STDIO_INLINE size_t _GL_ARG_NONNULL ((1, 4))
rpl_fwrite (const void *ptr, size_t s, size_t n, FILE *stream) rpl_fwrite (const void *ptr, size_t s, size_t n, FILE *stream)
{ {
size_t r = fwrite (ptr, s, n, stream); size_t r = fwrite (ptr, s, n, stream);
...@@ -1333,6 +1338,7 @@ _GL_WARN_ON_USE (vsprintf, "vsprintf is not always POSIX compliant - " ...@@ -1333,6 +1338,7 @@ _GL_WARN_ON_USE (vsprintf, "vsprintf is not always POSIX compliant - "
"POSIX compliance"); "POSIX compliance");
#endif #endif
_GL_INLINE_HEADER_END
#endif /* _@GUARD_PREFIX@_STDIO_H */ #endif /* _@GUARD_PREFIX@_STDIO_H */
#endif /* _@GUARD_PREFIX@_STDIO_H */ #endif /* _@GUARD_PREFIX@_STDIO_H */
......
...@@ -497,7 +497,7 @@ _GL_CXXALIAS_RPL (mkdir, int, (char const *name, mode_t mode)); ...@@ -497,7 +497,7 @@ _GL_CXXALIAS_RPL (mkdir, int, (char const *name, mode_t mode));
# if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__ # if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
# if !GNULIB_defined_rpl_mkdir # if !GNULIB_defined_rpl_mkdir
static inline int static int
rpl_mkdir (char const *name, mode_t mode) rpl_mkdir (char const *name, mode_t mode)
{ {
return _mkdir (name); return _mkdir (name);
......
#include <config.h>
#define _GL_UNISTD_INLINE _GL_EXTERN_INLINE
#include "unistd.h"
...@@ -127,6 +127,11 @@ ...@@ -127,6 +127,11 @@
# include <getopt.h> # include <getopt.h>
#endif #endif
_GL_INLINE_HEADER_BEGIN
#ifndef _GL_UNISTD_INLINE
# define _GL_UNISTD_INLINE _GL_INLINE
#endif
/* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */ /* The definitions of _GL_FUNCDECL_RPL etc. are copied here. */
/* The definition of _GL_ARG_NONNULL is copied here. */ /* The definition of _GL_ARG_NONNULL is copied here. */
...@@ -404,7 +409,7 @@ extern char **environ; ...@@ -404,7 +409,7 @@ extern char **environ;
# endif # endif
#elif defined GNULIB_POSIXCHECK #elif defined GNULIB_POSIXCHECK
# if HAVE_RAW_DECL_ENVIRON # if HAVE_RAW_DECL_ENVIRON
static inline char *** _GL_UNISTD_INLINE char ***
rpl_environ (void) rpl_environ (void)
{ {
return &environ; return &environ;
...@@ -862,7 +867,7 @@ _GL_CXXALIAS_RPL (getpagesize, int, (void)); ...@@ -862,7 +867,7 @@ _GL_CXXALIAS_RPL (getpagesize, int, (void));
# define getpagesize() _gl_getpagesize () # define getpagesize() _gl_getpagesize ()
# else # else
# if !GNULIB_defined_getpagesize_function # if !GNULIB_defined_getpagesize_function
static inline int _GL_UNISTD_INLINE int
getpagesize () getpagesize ()
{ {
return _gl_getpagesize (); return _gl_getpagesize ();
...@@ -1530,6 +1535,7 @@ _GL_CXXALIAS_SYS_CAST (write, ssize_t, (int fd, const void *buf, size_t count)); ...@@ -1530,6 +1535,7 @@ _GL_CXXALIAS_SYS_CAST (write, ssize_t, (int fd, const void *buf, size_t count));
_GL_CXXALIASWARN (write); _GL_CXXALIASWARN (write);
#endif #endif
_GL_INLINE_HEADER_END
#endif /* _@GUARD_PREFIX@_UNISTD_H */ #endif /* _@GUARD_PREFIX@_UNISTD_H */
#endif /* _@GUARD_PREFIX@_UNISTD_H */ #endif /* _@GUARD_PREFIX@_UNISTD_H */
# c-strtod.m4 serial 14 # c-strtod.m4 serial 15
# Copyright (C) 2004-2006, 2009-2012 Free Software Foundation, Inc. # Copyright (C) 2004-2006, 2009-2012 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation # This file is free software; the Free Software Foundation
...@@ -38,9 +38,6 @@ AC_DEFUN([gl_C_STRTOD], ...@@ -38,9 +38,6 @@ AC_DEFUN([gl_C_STRTOD],
[ [
AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
AC_CHECK_FUNCS([strtod_l]) AC_CHECK_FUNCS([strtod_l])
AC_REQUIRE([AC_C_INLINE])
:
]) ])
dnl Prerequisites of lib/c-strtold.c. dnl Prerequisites of lib/c-strtold.c.
...@@ -49,7 +46,4 @@ AC_DEFUN([gl_C_STRTOLD], ...@@ -49,7 +46,4 @@ AC_DEFUN([gl_C_STRTOLD],
AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
AC_REQUIRE([gl_C99_STRTOLD]) AC_REQUIRE([gl_C99_STRTOLD])
AC_CHECK_FUNCS([strtold_l]) AC_CHECK_FUNCS([strtold_l])
AC_REQUIRE([AC_C_INLINE])
:
]) ])
...@@ -7,7 +7,6 @@ dnl with or without modifications, as long as this notice is preserved. ...@@ -7,7 +7,6 @@ dnl with or without modifications, as long as this notice is preserved.
AC_DEFUN([gl_EXTERN_INLINE], AC_DEFUN([gl_EXTERN_INLINE],
[ [
AC_REQUIRE([AC_C_INLINE])
AH_VERBATIM([extern_inline], AH_VERBATIM([extern_inline],
[/* _GL_INLINE is a portable alternative to ISO C99 plain 'inline'. [/* _GL_INLINE is a portable alternative to ISO C99 plain 'inline'.
_GL_EXTERN_INLINE is a portable alternative to 'extern inline'. _GL_EXTERN_INLINE is a portable alternative to 'extern inline'.
...@@ -32,8 +31,8 @@ AC_DEFUN([gl_EXTERN_INLINE], ...@@ -32,8 +31,8 @@ AC_DEFUN([gl_EXTERN_INLINE],
# endif # endif
# define _GL_EXTERN_INLINE extern # define _GL_EXTERN_INLINE extern
#else #else
# define _GL_INLINE static inline # define _GL_INLINE static
# define _GL_EXTERN_INLINE static inline # define _GL_EXTERN_INLINE static
#endif #endif
#if 4 < __GNUC__ + (6 <= __GNUC_MINOR__) #if 4 < __GNUC__ + (6 <= __GNUC_MINOR__)
......
...@@ -690,6 +690,7 @@ AC_DEFUN([gl_FILE_LIST], [ ...@@ -690,6 +690,7 @@ AC_DEFUN([gl_FILE_LIST], [
lib/stdbool.in.h lib/stdbool.in.h
lib/stddef.in.h lib/stddef.in.h
lib/stdint.in.h lib/stdint.in.h
lib/stdio.c
lib/stdio.in.h lib/stdio.in.h
lib/stdlib.in.h lib/stdlib.in.h
lib/strftime.c lib/strftime.c
...@@ -712,6 +713,7 @@ AC_DEFUN([gl_FILE_LIST], [ ...@@ -712,6 +713,7 @@ AC_DEFUN([gl_FILE_LIST], [
lib/timespec.h lib/timespec.h
lib/u64.c lib/u64.c
lib/u64.h lib/u64.h
lib/unistd.c
lib/unistd.in.h lib/unistd.in.h
lib/utimens.c lib/utimens.c
lib/utimens.h lib/utimens.h
......
# serial 25 # serial 26
# Copyright (C) 1997-2001, 2003-2012 Free Software Foundation, Inc. # Copyright (C) 1997-2001, 2003-2012 Free Software Foundation, Inc.
# #
...@@ -27,11 +27,7 @@ AC_DEFUN([gl_FUNC_LSTAT], ...@@ -27,11 +27,7 @@ AC_DEFUN([gl_FUNC_LSTAT],
]) ])
# Prerequisites of lib/lstat.c. # Prerequisites of lib/lstat.c.
AC_DEFUN([gl_PREREQ_LSTAT], AC_DEFUN([gl_PREREQ_LSTAT], [:])
[
AC_REQUIRE([AC_C_INLINE])
:
])
AC_DEFUN([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK], AC_DEFUN([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK],
[ [
......
# md5.m4 serial 12 # md5.m4 serial 13
dnl Copyright (C) 2002-2006, 2008-2012 Free Software Foundation, Inc. dnl Copyright (C) 2002-2006, 2008-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it, dnl gives unlimited permission to copy and/or distribute it,
...@@ -8,6 +8,5 @@ AC_DEFUN([gl_MD5], ...@@ -8,6 +8,5 @@ AC_DEFUN([gl_MD5],
[ [
dnl Prerequisites of lib/md5.c. dnl Prerequisites of lib/md5.c.
AC_REQUIRE([gl_BIGENDIAN]) AC_REQUIRE([gl_BIGENDIAN])
AC_REQUIRE([AC_C_INLINE])
: :
]) ])
# sha1.m4 serial 10 # sha1.m4 serial 11
dnl Copyright (C) 2002-2006, 2008-2012 Free Software Foundation, Inc. dnl Copyright (C) 2002-2006, 2008-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it, dnl gives unlimited permission to copy and/or distribute it,
...@@ -8,6 +8,5 @@ AC_DEFUN([gl_SHA1], ...@@ -8,6 +8,5 @@ AC_DEFUN([gl_SHA1],
[ [
dnl Prerequisites of lib/sha1.c. dnl Prerequisites of lib/sha1.c.
AC_REQUIRE([gl_BIGENDIAN]) AC_REQUIRE([gl_BIGENDIAN])
AC_REQUIRE([AC_C_INLINE])
: :
]) ])
# sha256.m4 serial 5 # sha256.m4 serial 6
dnl Copyright (C) 2005, 2008-2012 Free Software Foundation, Inc. dnl Copyright (C) 2005, 2008-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it, dnl gives unlimited permission to copy and/or distribute it,
...@@ -8,5 +8,4 @@ AC_DEFUN([gl_SHA256], ...@@ -8,5 +8,4 @@ AC_DEFUN([gl_SHA256],
[ [
dnl Prerequisites of lib/sha256.c. dnl Prerequisites of lib/sha256.c.
AC_REQUIRE([gl_BIGENDIAN]) AC_REQUIRE([gl_BIGENDIAN])
AC_REQUIRE([AC_C_INLINE])
]) ])
# sha512.m4 serial 6 # sha512.m4 serial 7
dnl Copyright (C) 2005-2006, 2008-2012 Free Software Foundation, Inc. dnl Copyright (C) 2005-2006, 2008-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it, dnl gives unlimited permission to copy and/or distribute it,
...@@ -8,5 +8,4 @@ AC_DEFUN([gl_SHA512], ...@@ -8,5 +8,4 @@ AC_DEFUN([gl_SHA512],
[ [
dnl Prerequisites of lib/sha512.c. dnl Prerequisites of lib/sha512.c.
AC_REQUIRE([gl_BIGENDIAN]) AC_REQUIRE([gl_BIGENDIAN])
AC_REQUIRE([AC_C_INLINE])
]) ])
# serial 10 # serial 11
# Copyright (C) 2009-2012 Free Software Foundation, Inc. # Copyright (C) 2009-2012 Free Software Foundation, Inc.
# #
...@@ -68,8 +68,4 @@ AC_DEFUN([gl_FUNC_STAT], ...@@ -68,8 +68,4 @@ AC_DEFUN([gl_FUNC_STAT],
]) ])
# Prerequisites of lib/stat.c. # Prerequisites of lib/stat.c.
AC_DEFUN([gl_PREREQ_STAT], AC_DEFUN([gl_PREREQ_STAT], [:])
[
AC_REQUIRE([AC_C_INLINE])
:
])
# stdio_h.m4 serial 42 # stdio_h.m4 serial 43
dnl Copyright (C) 2007-2012 Free Software Foundation, Inc. dnl Copyright (C) 2007-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it, 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. ...@@ -7,7 +7,6 @@ dnl with or without modifications, as long as this notice is preserved.
AC_DEFUN([gl_STDIO_H], AC_DEFUN([gl_STDIO_H],
[ [
AC_REQUIRE([gl_STDIO_H_DEFAULTS]) AC_REQUIRE([gl_STDIO_H_DEFAULTS])
AC_REQUIRE([AC_C_INLINE])
gl_NEXT_HEADERS([stdio.h]) gl_NEXT_HEADERS([stdio.h])
dnl No need to create extra modules for these functions. Everyone who uses dnl No need to create extra modules for these functions. Everyone who uses
......
# sys_socket_h.m4 serial 22 # sys_socket_h.m4 serial 23
dnl Copyright (C) 2005-2012 Free Software Foundation, Inc. dnl Copyright (C) 2005-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it, dnl gives unlimited permission to copy and/or distribute it,
...@@ -10,7 +10,6 @@ AC_DEFUN([gl_HEADER_SYS_SOCKET], ...@@ -10,7 +10,6 @@ AC_DEFUN([gl_HEADER_SYS_SOCKET],
[ [
AC_REQUIRE([gl_SYS_SOCKET_H_DEFAULTS]) AC_REQUIRE([gl_SYS_SOCKET_H_DEFAULTS])
AC_REQUIRE([AC_CANONICAL_HOST]) AC_REQUIRE([AC_CANONICAL_HOST])
AC_REQUIRE([AC_C_INLINE])
dnl On OSF/1, the functions recv(), send(), recvfrom(), sendto() have dnl On OSF/1, the functions recv(), send(), recvfrom(), sendto() have
dnl old-style declarations (with return type 'int' instead of 'ssize_t') dnl old-style declarations (with return type 'int' instead of 'ssize_t')
......
# sys_stat_h.m4 serial 27 -*- Autoconf -*- # sys_stat_h.m4 serial 28 -*- Autoconf -*-
dnl Copyright (C) 2006-2012 Free Software Foundation, Inc. dnl Copyright (C) 2006-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it, dnl gives unlimited permission to copy and/or distribute it,
...@@ -11,9 +11,6 @@ AC_DEFUN([gl_HEADER_SYS_STAT_H], ...@@ -11,9 +11,6 @@ AC_DEFUN([gl_HEADER_SYS_STAT_H],
[ [
AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS]) AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS])
dnl For the mkdir substitute.
AC_REQUIRE([AC_C_INLINE])
dnl Check for broken stat macros. dnl Check for broken stat macros.
AC_REQUIRE([AC_HEADER_STAT]) AC_REQUIRE([AC_HEADER_STAT])
......
# unistd_h.m4 serial 65 # unistd_h.m4 serial 66
dnl Copyright (C) 2006-2012 Free Software Foundation, Inc. dnl Copyright (C) 2006-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it, dnl gives unlimited permission to copy and/or distribute it,
...@@ -11,7 +11,6 @@ AC_DEFUN([gl_UNISTD_H], ...@@ -11,7 +11,6 @@ AC_DEFUN([gl_UNISTD_H],
dnl Use AC_REQUIRE here, so that the default behavior below is expanded dnl Use AC_REQUIRE here, so that the default behavior below is expanded
dnl once only, before all statements that occur in other macros. dnl once only, before all statements that occur in other macros.
AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
AC_REQUIRE([AC_C_INLINE])
gl_CHECK_NEXT_HEADERS([unistd.h]) gl_CHECK_NEXT_HEADERS([unistd.h])
if test $ac_cv_header_unistd_h = yes; then if test $ac_cv_header_unistd_h = yes; then
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment