X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fglob_.h;h=95fb240f129e3fd2e08028322ba5a26cb307c7ef;hb=5131be5b019b1110cd597012b63e48886aaaafc7;hp=63e8ccb2e231b76406eef7f11e46911e8397301d;hpb=2d4c3914efc4bbe03b56573a5aaa69b4c9efd525;p=gnulib.git

diff --git a/lib/glob_.h b/lib/glob_.h
index 63e8ccb2e..95fb240f1 100644
--- a/lib/glob_.h
+++ b/lib/glob_.h
@@ -19,7 +19,13 @@
 #ifndef	_GLOB_H
 #define	_GLOB_H	1
 
-#ifndef MISSING_SYS_CDEFS_H
+/* Note the reversal of the common HAVE_SYS_CDEFS_H idiom below.  In this
+   way, #ifndef _SYS_CDEFS_H may be used to include <sys/cdefs.h> both when
+   it has been checked for via the GNULIB configure test and found and when
+   it has not been checked for, which we can presume means that the <glob.h>
+   GNULIB shares with GLIBC is being included as a system header and not as
+   part of GNULIB, in which case <sys/cdefs.h> may be assumed.  */
+#ifndef _SYS_CDEFS_H
 # include <sys/cdefs.h>
 #endif
 #ifndef __BEGIN_DECLS
@@ -129,11 +135,11 @@ typedef struct
        are used instead of the normal file access functions.  */
     void (*gl_closedir) (void *);
 #ifdef __USE_GNU
-#if defined HAVE_DIRENT_H || defined __GNU_LIBRARY__
+# if defined HAVE_DIRENT_H || defined __GNU_LIBRARY__
     struct dirent *(*gl_readdir) (void *);
-#else
+# else
     struct direct *(*gl_readdir) (void *);
-#endif
+# endif
 #else
     void *(*gl_readdir) (void *);
 #endif