GNU C Library master sources branch master updated. glibc-2.18-741-g20f4a8d

[vapier at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  20f4a8d9937b2a824a5d20583dd850070fe29988 (commit)
      from  22562bb222a91e0ecc416b19accd98e10c0d26be (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=20f4a8d9937b2a824a5d20583dd850070fe29988

commit 20f4a8d9937b2a824a5d20583dd850070fe29988
Author: Mike Frysinger <vapier@gentoo.org>
Date:   Tue Dec 31 11:36:54 2013 -0500

    tst-fanotify: switch to AC_DEFINE
    
    Reported-by: Joseph S. Myers <joseph@codesourcery.com>
    Signed-off-by: Mike Frysinger <vapier@gentoo.org>

diff --git a/ChangeLog b/ChangeLog
index 0e6850d..ddfb69a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2014-01-04  Mike Frysinger  <vapier@gentoo.org>
+
+	* config.h.in: Add HAVE_LINUX_FANOTIFY_H template.
+	* sysdeps/unix/sysv/linux/configure: Regenerated.
+	* sysdeps/unix/sysv/linux/configure.ac: Call AC_DEFINE.
+	* sysdeps/unix/sysv/linux/tst-fanotify.c: Include config.h.
+
 2014-01-03  Joseph Myers  <joseph@codesourcery.com>
 
 	[BZ #16390]
diff --git a/config.h.in b/config.h.in
index f6151c5..40797e7 100644
--- a/config.h.in
+++ b/config.h.in
@@ -192,6 +192,9 @@
 /* Define if STT_GNU_IFUNC support actually works.  */
 #undef HAVE_IFUNC
 
+/* Define if linux/fanotify.h is available.  */
+#undef HAVE_LINUX_FANOTIFY_H
+
 /*
  */
 
diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure
index ab0f03c..d5ee4ef 100644
--- a/sysdeps/unix/sysv/linux/configure
+++ b/sysdeps/unix/sysv/linux/configure
@@ -303,7 +303,8 @@ fi
 ac_fn_c_check_header_compile "$LINENO" "linux/fanotify.h" "ac_cv_header_linux_fanotify_h" "/* No default includes.  */
 "
 if test "x$ac_cv_header_linux_fanotify_h" = xyes; then :
-  DEFINES="$DEFINES -DHAVE_LINUX_FANOTIFY_H=1"
+  $as_echo "#define HAVE_LINUX_FANOTIFY_H 1" >>confdefs.h
+
 fi
 
 
diff --git a/sysdeps/unix/sysv/linux/configure.ac b/sysdeps/unix/sysv/linux/configure.ac
index 6d6053f..90cbf48 100644
--- a/sysdeps/unix/sysv/linux/configure.ac
+++ b/sysdeps/unix/sysv/linux/configure.ac
@@ -108,7 +108,7 @@ fi
 # Until we start requiring 2.6.37+ headers, we need to check for the
 # availability of linux/fanotify.h for testing purposes.
 AC_CHECK_HEADER(linux/fanotify.h,
-  [DEFINES="$DEFINES -DHAVE_LINUX_FANOTIFY_H=1"], ,
+  [AC_DEFINE(HAVE_LINUX_FANOTIFY_H)], ,
   [/* No default includes.  */])
 
 # The result of the above test for the use of the FDE code is invalid if
diff --git a/sysdeps/unix/sysv/linux/tst-fanotify.c b/sysdeps/unix/sysv/linux/tst-fanotify.c
index 43d3bb2..fb3c77e 100644
--- a/sysdeps/unix/sysv/linux/tst-fanotify.c
+++ b/sysdeps/unix/sysv/linux/tst-fanotify.c
@@ -16,6 +16,7 @@
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
+#include <config.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                              |    7 +++++++
 config.h.in                            |    3 +++
 sysdeps/unix/sysv/linux/configure      |    3 ++-
 sysdeps/unix/sysv/linux/configure.ac   |    2 +-
 sysdeps/unix/sysv/linux/tst-fanotify.c |    1 +
 5 files changed, 14 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources