Add multiple-inclusion guard.

diff --git a/include/alloca.h b/include/alloca.h
index ae41090..4dcddb6 100644 (file)
--- a/include/alloca.h
+++ b/include/alloca.h
@@ -1,3 +1,5 @@
+#ifndef _ALLOCA_H
+
 #include <stdlib/alloca.h>
 
 #undef __alloca
@@ -8,3 +10,5 @@ extern __ptr_t __alloca __P ((size_t __size));
 #ifdef __GNUC__
 # define __alloca(size)        __builtin_alloca (size)
 #endif /* GCC.  */
+
+#endif

diff --git a/include/db.h b/include/db.h
index 13e9c30..64c7348 100644 (file)
--- a/include/db.h
+++ b/include/db.h
@@ -1,5 +1,9 @@
+#ifndef _DB_H_
+
 #include <db2/db.h>
 
 /* Internal interface for NSS.  */
 int __nss_db_open __P((const char *,
                       DBTYPE, u_int32_t, int, DB_ENV *, DB_INFO *, DB **));
+
+#endif

diff --git a/include/db_185.h b/include/db_185.h
index db78199..37bb16e 100644 (file)
--- a/include/db_185.h
+++ b/include/db_185.h
@@ -1,4 +1,6 @@
+#ifndef _DB_185_H_
 #include <db2/db_185.h>
 
 /* Now define the internal interfaces.  */
 DB *__dbopen __P((const char *, int, int, DBTYPE, const void *));
+#endif

diff --git a/include/dlfcn.h b/include/dlfcn.h
index 766c80a..9558197 100644 (file)
--- a/include/dlfcn.h
+++ b/include/dlfcn.h
@@ -1,5 +1,7 @@
+#ifndef _DLFCN_H
 #include <elf/dlfcn.h>
 
 /* Now define the internal interfaces.  */
 extern void *__dlvsym __P ((void *__handle, __const char *__name,
                            __const char *__version));
+#endif

diff --git a/include/fcntl.h b/include/fcntl.h
index cce3d5e..949c662 100644 (file)
--- a/include/fcntl.h
+++ b/include/fcntl.h
@@ -1,4 +1,6 @@
+#ifndef _FCNTL_H
 #include <io/fcntl.h>
 
 /* Now define the internal interfaces.  */
 extern int __open64 __P ((__const char *__file, int __oflag, ...));
+#endif

diff --git a/include/grp.h b/include/grp.h
index ddde842..14be78c 100644 (file)
--- a/include/grp.h
+++ b/include/grp.h
@@ -1,3 +1,4 @@
+#ifndef _GRP_H
 #include <grp/grp.h>
 
 /* Now define the internal interfaces.  */
@@ -6,3 +7,4 @@ extern int __getgrent_r __P ((struct group *__resultbuf, char *buffer,
 extern int __fgetgrent_r __P ((FILE * __stream, struct group *__resultbuf,
                               char *buffer, size_t __buflen,
                               struct group **__result));
+#endif

diff --git a/include/libintl.h b/include/libintl.h
index 582cb05..3763b04 100644 (file)
--- a/include/libintl.h
+++ b/include/libintl.h
@@ -1,3 +1,4 @@
+#ifndef _LIBINTL_H
 #include <intl/libintl.h>
 
 /* Now define the internal interfaces.  */
@@ -5,3 +6,4 @@ extern char *__gettext __P ((__const char *__msgid));
 extern char *__textdomain __P ((__const char *__domainname));
 extern char *__bindtextdomain __P ((__const char *__domainname,
                                    __const char *__dirname));
+#endif

diff --git a/include/mntent.h b/include/mntent.h
index d869625..ca8dfc5 100644 (file)
--- a/include/mntent.h
+++ b/include/mntent.h
@@ -1,3 +1,4 @@
+#ifndef _MNTENT_H
 #include <misc/mntent.h>
 
 /* Now define the internal interfaces.  */
@@ -9,3 +10,4 @@ extern int __addmntent __P ((FILE *__stream, __const struct mntent *__mnt));
 extern int __endmntent __P ((FILE *__stream));
 extern char *__hasmntopt __P ((__const struct mntent *__mnt,
                               __const char *__opt));
+#endif

diff --git a/include/pwd.h b/include/pwd.h
index 2c57df9..18e8ac7 100644 (file)
--- a/include/pwd.h
+++ b/include/pwd.h
@@ -1,3 +1,4 @@
+#ifndef _PWD_H
 #include <pwd/pwd.h>
 
 /* Now define the internal interfaces.  */
@@ -12,3 +13,4 @@ extern int __getpwnam_r __P ((__const char *__name, struct passwd *__resultbuf,
 extern int __fgetpwent_r __P ((FILE * __stream, struct passwd *__resultbuf,
                               char *__buffer, size_t __buflen,
                               struct passwd **__result));
+#endif

diff --git a/include/sched.h b/include/sched.h
index 02dc60a..d28a012 100644 (file)
--- a/include/sched.h
+++ b/include/sched.h
@@ -1,7 +1,9 @@
-#include "posix/sched.h"
+#ifndef _SCHED_H
+#include <posix/sched.h>
 
 /* Now define the internal interfaces.  */
 
 /* This is Linux specific.  */
 extern int __clone __P ((int (*__fn) (void *__arg), void *__child_stack,
                         int __flags, void *__arg));
+#endif

diff --git a/include/search.h b/include/search.h
index 05dc75a..2b4c63b 100644 (file)
--- a/include/search.h
+++ b/include/search.h
@@ -1,3 +1,4 @@
+#ifndef _SEARCH_H
 #include <misc/search.h>
 
 /* Now define the internal interfaces.  */
@@ -10,3 +11,4 @@ extern void *__tdelete __PMT ((__const void *__key, void **__rootp,
                               __compar_fn_t compar));
 extern void __twalk __PMT ((__const void *__root, __action_fn_t action));
 extern void __tdestroy __PMT ((void *__root, __free_fn_t freefct));
+#endif

diff --git a/include/setjmp.h b/include/setjmp.h
index 34fc9e5..97b1c3a 100644 (file)
--- a/include/setjmp.h
+++ b/include/setjmp.h
@@ -1,3 +1,4 @@
+#ifndef _SETJMP_H
 #include <setjmp/setjmp.h>
 
 /* Now define the internal interfaces.  */
@@ -11,3 +12,4 @@ extern void __longjmp __P ((__jmp_buf __env, int __val))
    This is used by the machine-dependent definition of `__sigsetjmp'.
    Always returns zero, for convenience.  */
 extern int __sigjmp_save __P ((jmp_buf __env, int __savemask));
+#endif

diff --git a/include/shadow.h b/include/shadow.h
index 5e7f943..be40eb4 100644 (file)
--- a/include/shadow.h
+++ b/include/shadow.h
@@ -1,3 +1,4 @@
+#ifndef _SHADOW_H
 #include <shadow/shadow.h>
 
 /* Now define the internal interfaces.  */
@@ -14,3 +15,4 @@ extern int __fgetspent_r __P ((FILE *__stream, struct spwd *__result_buf,
                               struct spwd **__result));
 extern int __lckpwdf __P ((void));
 extern int __ulckpwdf __P ((void));
+#endif

diff --git a/include/signal.h b/include/signal.h
index 693aeb8..1a14ff3 100644 (file)
--- a/include/signal.h
+++ b/include/signal.h
@@ -1,3 +1,4 @@
+#ifndef _SIGNAL_H
 #if defined __need_sig_atomic_t || defined __need_sigset_t
 # include <signal/signal.h>
 #else
@@ -23,3 +24,4 @@ extern int __sigreturn __P ((struct sigcontext *__scp));
 extern int __sigaltstack __P ((__const struct sigaltstack *__ss,
                               struct sigaltstack *__oss));
 #endif
+#endif

diff --git a/include/stdio.h b/include/stdio.h
index d09e29d..a3272fc 100644 (file)
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -1,3 +1,4 @@
+#ifndef _STDIO_H
 #ifdef USE_IN_LIBIO
 #ifdef __need_FILE
 # include <libio/stdio.h>
@@ -27,3 +28,4 @@ extern int __vsscanf __P ((__const char *__restrict __s,
 #else
 #include <stdio/stdio.h>
 #endif
+#endif

diff --git a/include/stdlib.h b/include/stdlib.h
index c457304..7424243 100644 (file)
--- a/include/stdlib.h
+++ b/include/stdlib.h
@@ -1,3 +1,4 @@
+#ifndef _STDLIB_H
 #include <stdlib/stdlib.h>
 
 /* Now define the internal interfaces.  */
@@ -39,3 +40,4 @@ extern char *__canonicalize_file_name __P ((__const char *__name));
 extern char *__realpath __P ((__const char *__name, char *__resolved));
 extern int __ptsname_r __P ((int __fd, char *__buf, size_t __buflen));
 extern int __getpt __P ((void));
+#endif

diff --git a/include/string.h b/include/string.h
index 1ee7ced..d83a56e 100644 (file)
--- a/include/string.h
+++ b/include/string.h
@@ -1,3 +1,4 @@
+#ifndef _STRING_H
 #include <string/string.h>
 
 /* Now define the internal interfaces.  */
@@ -6,3 +7,4 @@ extern __ptr_t __memccpy __P ((__ptr_t __dest, __const __ptr_t __src,
 extern size_t __strnlen __P ((__const char *__string, size_t __maxlen));
 extern char *__strsep __P ((char **__stringp, __const char *__delim));
 extern int __strverscmp __P ((__const char *__s1, __const char *__s2));
+#endif

diff --git a/include/termios.h b/include/termios.h
index 90237a8..ed3b365 100644 (file)
--- a/include/termios.h
+++ b/include/termios.h
@@ -1,4 +1,6 @@
+#ifndef _TERMIOS_H
 #include <termios/termios.h>
 
 /* Now define the internal interfaces.  */
 extern int __tcgetattr __P ((int __fd, struct termios *__termios_p));
+#endif

diff --git a/include/tgmath.h b/include/tgmath.h
new file mode 100644 (file)
index 0000000..3a2c4a2
--- /dev/null
+++ b/include/tgmath.h
@@ -0,0 +1 @@
+#include <math/tgmath.h>

diff --git a/include/time.h b/include/time.h
index bc8ce06..2659e62 100644 (file)
--- a/include/time.h
+++ b/include/time.h
@@ -1,3 +1,4 @@
+#ifndef _TIME_H
 #if defined __need_time_t  || defined __need_clock_t || defined __need_timespec
 # include <time/time.h>
 #else
@@ -35,3 +36,4 @@ extern int __nanosleep __P ((__const struct timespec *__requested_time,
                             struct timespec *__remaining));
 extern int __getdate_r __P ((__const char *__string, struct tm *__resbufp));
 #endif
+#endif

diff --git a/include/ulimit.h b/include/ulimit.h
index c1523a1..8dc51d5 100644 (file)
--- a/include/ulimit.h
+++ b/include/ulimit.h
@@ -1,4 +1,6 @@
+#ifndef _ULIMIT_H
 #include <resource/ulimit.h>
 
 /* Now define the internal interfaces.  */
 extern long int __ulimit __P ((int __cmd, ...));
+#endif

diff --git a/include/utmp.h b/include/utmp.h
index 4535acb..b7f7d5f 100644 (file)
--- a/include/utmp.h
+++ b/include/utmp.h
@@ -1,3 +1,4 @@
+#ifndef _UTMP_H
 #include <login/utmp.h>
 
 /* Now define the internal interfaces.  */
@@ -15,3 +16,4 @@ extern int __getutid_r __P ((__const struct utmp *__id, struct utmp *__buffer,
                             struct utmp **__result));
 extern int __getutline_r __P ((__const struct utmp *__line,
                               struct utmp *__buffer, struct utmp **__result));
+#endif

diff --git a/include/wchar.h b/include/wchar.h
index 95a8c43..33166ed 100644 (file)
--- a/include/wchar.h
+++ b/include/wchar.h
@@ -1,3 +1,4 @@
+#ifndef _WCHAR_H
 #include <wcsmbs/wchar.h>
 
 /* Now define the internal interfaces.  */
@@ -28,3 +29,4 @@ extern size_t __wcsnrtombs __P ((char *__restrict __dst,
 extern wchar_t *__wcpcpy __P ((wchar_t *__dest, __const wchar_t *__src));
 extern wchar_t *__wcpncpy __P ((wchar_t *__dest, __const wchar_t *__src,
                                size_t __n));
+#endif