From: Derek R. Price <derek@ximbiot.com>
Date: Tue, 31 May 2005 21:01:15 +0000 (+0000)
Subject: Sync from cvs.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=994784dea338e97090e8b3caf199df82cd6fa8b8;p=pspp

Sync from cvs.
* glob_.h: s/MISSING_SYS_CDEFS_H/_SYS_CDEFS_H/ and comment.
---

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 2f91443bd8..d95b246de0 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,9 @@
+2005-05-31  Derek Price  <derek@ximbiot.com>
+	    Paul Eggert  <eggert@cs.ucla.edu>
+
+	Sync from cvs.
+	* glob_.h: s/MISSING_SYS_CDEFS_H/_SYS_CDEFS_H/ and comment.
+
 2005-05-29  Derek Price  <derek@ximbiot.com>
 	    Paul Eggert  <eggert@cs.ucla.edu>
 
diff --git a/lib/glob_.h b/lib/glob_.h
index 63e8ccb2e2..00edbddb09 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