From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 23 Oct 2013 04:01:46 +0000 (-0700)
Subject: Merge from gnulib.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1184
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=758bed52afd57bd140409bfbbeabb4a89b5182d3;p=emacs.git

Merge from gnulib.

This incorporates:
2013-10-14 acl: allow cross-compilation to Gentoo
2013-10-18 extern-inline: make safe for -Wundef usage
2013-09-30 fpending: use pure+const function attrs
* lib/fpending.h, m4/acl.m4, m4/extern-inline.m4: Update from gnulib.
---

diff --git a/ChangeLog b/ChangeLog
index c1700c017a3..bf0c7b0afde 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2013-10-23  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Merge from gnulib, incorporating:
+	2013-10-14 acl: allow cross-compilation to Gentoo
+	2013-10-18 extern-inline: make safe for -Wundef usage
+	2013-09-30 fpending: use pure+const function attrs
+	* lib/fpending.h, m4/acl.m4, m4/extern-inline.m4: Update from gnulib.
+
 2013-10-13  Glenn Morris  <rgm@gnu.org>
 
 	* configure.ac [alpha]: Explicit error in non-ELF case.  (Bug#15601)
diff --git a/lib/fpending.h b/lib/fpending.h
index 4eca3f18e17..30d67fcd74f 100644
--- a/lib/fpending.h
+++ b/lib/fpending.h
@@ -25,5 +25,5 @@
 #endif
 
 #ifndef __fpending
-size_t __fpending (FILE *);
+size_t __fpending (FILE *) _GL_ATTRIBUTE_PURE;
 #endif
diff --git a/m4/acl.m4 b/m4/acl.m4
index 5b1fb65e6e6..24b6e4969d1 100644
--- a/m4/acl.m4
+++ b/m4/acl.m4
@@ -1,5 +1,5 @@
 # acl.m4 - check for access control list (ACL) primitives
-# serial 15
+# serial 16
 
 # Copyright (C) 2002, 2004-2013 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
@@ -141,12 +141,14 @@ int type = ACL_TYPE_EXTENDED;]])],
 # -------------------------------------
 # If 'acl_get_file' works (does not have a particular bug),
 # run IF-WORKS, otherwise, IF-NOT.
-# This tests for a Darwin 8.7.0 bug, whereby acl_get_file returns NULL,
-# but sets errno = ENOENT for an existing file or directory.
+# When building natively, test for a Darwin 8.7.0 bug, whereby acl_get_file
+# returns NULL, but sets errno = ENOENT for an existing file or directory.
+# When cross-compiling, assume that this old bug no longer applies.
 AC_DEFUN([gl_ACL_GET_FILE],
 [
   AC_CACHE_CHECK([for working acl_get_file], [gl_cv_func_working_acl_get_file],
-    [AC_RUN_IFELSE(
+    [gl_cv_func_working_acl_get_file=no
+     AC_LINK_IFELSE(
        [AC_LANG_PROGRAM(
           [[#include <sys/types.h>
            #include <sys/acl.h>
@@ -156,9 +158,10 @@ AC_DEFUN([gl_ACL_GET_FILE],
               return 1;
             return 0;
           ]])],
-       [gl_cv_func_working_acl_get_file=yes],
-       [gl_cv_func_working_acl_get_file=no],
-       [gl_cv_func_working_acl_get_file=cross-compiling])])
-
-  AS_IF([test $gl_cv_func_working_acl_get_file = yes], [$1], [$2])
+       [if test $cross_compiling = yes; then
+          gl_cv_func_working_acl_get_file="guessing yes"
+        elif ./conftest$ac_exeext; then
+          gl_cv_func_working_acl_get_file=yes
+        fi])])
+  AS_IF([test "$gl_cv_func_working_acl_get_file" != no], [$1], [$2])
 ])
diff --git a/m4/extern-inline.m4 b/m4/extern-inline.m4
index 4862d60d8e7..e4454d8fe3d 100644
--- a/m4/extern-inline.m4
+++ b/m4/extern-inline.m4
@@ -1,3 +1,4 @@
+# extern-inline.m4 serial 2
 dnl 'extern inline' a la ISO C99.
 
 dnl Copyright 2012-2013 Free Software Foundation, Inc.
@@ -41,7 +42,7 @@ AC_DEFUN([gl_EXTERN_INLINE],
 # define _GL_EXTERN_INLINE_IN_USE
 #elif (2 < __GNUC__ + (7 <= __GNUC_MINOR__) && !defined __STRICT_ANSI__ \
        && !defined _GL_EXTERN_INLINE_APPLE_BUG)
-# if __GNUC_GNU_INLINE__
+# if defined __GNUC_GNU_INLINE__ && __GNUC_GNU_INLINE__
    /* __gnu_inline__ suppresses a GCC 4.2 diagnostic.  */
 #  define _GL_INLINE extern inline __attribute__ ((__gnu_inline__))
 # else