From: Derek R. Price <derek@ximbiot.com>
Date: Tue, 7 Jun 2005 14:58:46 +0000 (+0000)
Subject: Sync from CVS.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=36f86806352fe1d69acc6e1a567c426a653abd63;p=pspp

Sync from CVS.
* glob_.h: Indent nested #ifdef.
---

diff --git a/lib/ChangeLog b/lib/ChangeLog
index f8269a5861..a31b06d2ea 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-07  Derek Price  <derek@ximbiot.com>
+
+	Sync from CVS.
+	* glob_.h: Indent nested #ifdef.
+
 2005-06-02  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Sync from coreutils.
diff --git a/lib/glob_.h b/lib/glob_.h
index 00edbddb09..95fb240f12 100644
--- a/lib/glob_.h
+++ b/lib/glob_.h
@@ -135,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