X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fglob_.h;h=451b111e22e2e4430fd5a6342db5cd3d3ca9db51;hb=a3a70ebafd7f2fdc069d43e8a26fc246dd7fe5bb;hp=fcf6f0d726f3e5b75d36a62101cd5e76ab48afd6;hpb=83213adaafac3f08809f35d8130a056969b97123;p=gnulib.git

diff --git a/lib/glob_.h b/lib/glob_.h
index fcf6f0d72..451b111e2 100644
--- a/lib/glob_.h
+++ b/lib/glob_.h
@@ -1,6 +1,6 @@
 /* glob_.h -- Find a path matching a pattern.
 
-   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+   Copyright (C) 2005-2007 Free Software Foundation, Inc.
 
    Written by Derek Price <derek@ximbiot.com> & Paul Eggert <eggert@CS.UCLA.EDU>
 
@@ -18,15 +18,20 @@
    along with this program; if not, write to the Free Software Foundation,
    Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
-#ifndef GLOB_H
-#define GLOB_H 1
+#ifndef _GL_GLOB_H
+#define _GL_GLOB_H
 
-#ifdef HAVE_SYS_CDEFS_H
+#if @HAVE_SYS_CDEFS_H@
 # include <sys/cdefs.h>
 #endif
 
 #include <stddef.h>
 
+/* On some systems, such as AIX 5.1, <sys/stat.h> does a "#define stat stat64".
+   Make sure this definition is seen before glob-libc.h defines types that
+   rely on 'struct stat'.  */
+#include <sys/stat.h>
+
 #ifndef __BEGIN_DECLS
 # define __BEGIN_DECLS
 # define __END_DECLS
@@ -38,18 +43,11 @@
 #ifndef __size_t
 # define __size_t	size_t
 #endif
-#ifndef __restrict
-# define __restrict	restrict
-#endif
 #ifndef __USE_GNU
 # define __USE_GNU    1
 #endif
 
 
-#ifndef HAVE_DIRENT_H
-# define dirent direct
-#endif
-
 #define glob rpl_glob
 #define globfree rpl_globfree
 #define glob_pattern_p rpl_glob_pattern_p
@@ -59,4 +57,4 @@
 /* Now the standard GNU C Library header should work.  */
 #include "glob-libc.h"
 
-#endif /* GLOB_H */
+#endif /* _GL_GLOB_H */