summaryrefslogtreecommitdiff
path: root/glob/glob.h
diff options
context:
space:
mode:
authorPaul Smith <psmith@gnu.org>1999-09-14 00:17:58 +0000
committerPaul Smith <psmith@gnu.org>1999-09-14 00:17:58 +0000
commit4121dea6a59367b4431cbe7a3c43d74fec9fd832 (patch)
tree1b614d858168eb4a313d773de343feecd3087c3c /glob/glob.h
parentb88c1d3a3db2d8d3381fe423edd7bd794f7cb21a (diff)
downloadgunmake-4121dea6a59367b4431cbe7a3c43d74fec9fd832.tar.gz
* Some configuration fixes.
Diffstat (limited to 'glob/glob.h')
-rw-r--r--glob/glob.h28
1 files changed, 14 insertions, 14 deletions
diff --git a/glob/glob.h b/glob/glob.h
index 6a3ab18..7c2a67a 100644
--- a/glob/glob.h
+++ b/glob/glob.h
@@ -140,6 +140,19 @@ typedef struct
} glob64_t;
#endif
+#if _FILE_OFFSET_BITS == 64 && __GNUC__ < 2
+# define glob glob64
+# define globfree globfree64
+#else
+# ifdef _LARGEFILE64_SOURCE
+extern int glob64 __P ((__const char *__pattern, int __flags,
+ int (*__errfunc) (__const char *, int),
+ glob64_t *__pglob));
+
+extern void globfree64 __P ((glob64_t *__pglob));
+# endif
+#endif
+
/* Do glob searching for PATTERN, placing results in PGLOB.
The bits defined above may be set in FLAGS.
If a directory cannot be opened or read and ERRFUNC is not nil,
@@ -148,7 +161,7 @@ typedef struct
`glob' returns GLOB_ABEND; if it returns zero, the error is ignored.
If memory cannot be allocated for PGLOB, GLOB_NOSPACE is returned.
Otherwise, `glob' returns zero. */
-#if _FILE_OFFSET_BITS != 64
+#if _FILE_OFFSET_BITS != 64 || __GNUC__ < 2
extern int glob __P ((__const char *__pattern, int __flags,
int (*__errfunc) (__const char *, int),
glob_t *__pglob));
@@ -156,24 +169,11 @@ extern int glob __P ((__const char *__pattern, int __flags,
/* Free storage allocated in PGLOB by a previous `glob' call. */
extern void globfree __P ((glob_t *__pglob));
#else
-# if __GNUC__ >= 2
extern int glob __P ((__const char *__pattern, int __flags,
int (*__errfunc) (__const char *, int),
glob_t *__pglob)) __asm__ ("glob64");
extern void globfree __P ((glob_t *__pglob)) __asm__ ("globfree64");
-# else
-# define glob glob64
-# define globfree globfree64
-# endif
-#endif
-
-#ifdef _LARGEFILE64_SOURCE
-extern int glob64 __P ((__const char *__pattern, int __flags,
- int (*__errfunc) (__const char *, int),
- glob64_t *__pglob));
-
-extern void globfree64 __P ((glob64_t *__pglob));
#endif