linux-generic: add header guard for <not-cancel.h>

In general we just try to include <not-cancel.h> once, thus avoiding
any issues with multiple inclusion.

However, the getaddrinfo sources are somewhat tangled, and .c files
include each other to get the final result.  Each .c file currently has
its own include of <not-cancel.h>.  While you could properly re-factor
this for the case of gai.c, the posix/tst-rfc3484.c tests directly include
one of the sub-files (sysdeps/posix/getaddrinfo.c), and it starts to
feel fragile.

diff --git a/ChangeLog.linux-generic b/ChangeLog.linux-generic
index 811b6c6..f74df7c 100644 (file)
--- a/ChangeLog.linux-generic
+++ b/ChangeLog.linux-generic
@@ -1,5 +1,10 @@
 2012-05-16  Chris Metcalf  <cmetcalf@tilera.com>
 
+       * sysdeps/unix/sysv/linux/generic/not-cancel.h: Add
+       multiple-inclusion guard.
+
+2012-05-16  Chris Metcalf  <cmetcalf@tilera.com>
+
        * sysdeps/unix/sysv/linux/generic/bits/typesizes.h:
        Remove now-unused __SNSECONDS_T_TYPE, and add new
        __SYSCALL_ULONG_TYPE and __SYSCALL_SLONG_TYPE types.

diff --git a/sysdeps/unix/sysv/linux/generic/not-cancel.h b/sysdeps/unix/sysv/linux/generic/not-cancel.h
index ae46e16..512252a 100644 (file)
--- a/sysdeps/unix/sysv/linux/generic/not-cancel.h
+++ b/sysdeps/unix/sysv/linux/generic/not-cancel.h
@@ -17,6 +17,9 @@
    License along with the GNU C Library.  If not, see
    <http://www.gnu.org/licenses/>.  */
 
+#ifndef _LINUX_GENERIC_NOT_CANCEL_H
+#define _LINUX_GENERIC_NOT_CANCEL_H
+
 #include <sysdeps/unix/sysv/linux/not-cancel.h>
 #include <fcntl.h>
 
@@ -27,3 +30,5 @@
 #undef open_not_cancel_2
 #define open_not_cancel_2(name, flags) \
   INLINE_SYSCALL (openat, 3, AT_FDCWD, (const char *) (name), (flags))
+
+#endif