summaryrefslogtreecommitdiff
path: root/misc/glob.c
diff options
context:
space:
mode:
authorjbj <devnull@localhost>1998-10-08 10:40:27 +0000
committerjbj <devnull@localhost>1998-10-08 10:40:27 +0000
commit1516f1d56c6fc74fa77596e78237ab7400cae4e2 (patch)
treed50493daa35a055572afd7d2856ed62ae6069463 /misc/glob.c
parent44184bacebad7f7e3d8afc6e31015683ff78e5f5 (diff)
downloadrpm-1516f1d56c6fc74fa77596e78237ab7400cae4e2.tar.gz
rpm-1516f1d56c6fc74fa77596e78237ab7400cae4e2.tar.bz2
rpm-1516f1d56c6fc74fa77596e78237ab7400cae4e2.zip
configure using automake.
CVS patchset: 2418 CVS date: 1998/10/08 10:40:27
Diffstat (limited to 'misc/glob.c')
-rw-r--r--misc/glob.c31
1 files changed, 12 insertions, 19 deletions
diff --git a/misc/glob.c b/misc/glob.c
index 886e837ef..8cfd3377a 100644
--- a/misc/glob.c
+++ b/misc/glob.c
@@ -32,7 +32,6 @@ Cambridge, MA 02139, USA. */
#if defined (_LIBC) || !defined (__GNU_LIBRARY__)
-
#ifdef STDC_HEADERS
#include <stddef.h>
#endif
@@ -69,18 +68,12 @@ extern int errno;
#else /* No standard headers. */
#ifdef HAVE_STRING_H
-#include <string.h>
#define ANSI_STRING
-#else
-#include <strings.h>
#endif
#ifdef HAVE_MEMORY_H
#include <memory.h>
#endif
-extern char *malloc (), *realloc ();
-extern void free ();
-
extern void qsort ();
extern void abort (), exit ();
@@ -152,21 +145,21 @@ extern char *alloca ();
/* Some system header files erroneously define these.
We want our own definitions from <fnmatch.h> to take precedence. */
-#undef FNM_PATHNAME
-#undef FNM_NOESCAPE
-#undef FNM_PERIOD
+#undef FNM_PATHNAME
+#undef FNM_NOESCAPE
+#undef FNM_PERIOD
/* Some system header files erroneously define these.
We want our own definitions from <glob.h> to take precedence. */
-#undef GLOB_ERR
-#undef GLOB_MARK
-#undef GLOB_NOSORT
-#undef GLOB_DOOFFS
-#undef GLOB_NOCHECK
-#undef GLOB_APPEND
-#undef GLOB_NOESCAPE
-#undef GLOB_PERIOD
-
+#undef GLOB_ERR
+#undef GLOB_MARK
+#undef GLOB_NOSORT
+#undef GLOB_DOOFFS
+#undef GLOB_NOCHECK
+#undef GLOB_APPEND
+#undef GLOB_NOESCAPE
+#undef GLOB_PERIOD
+
__ptr_t (*__glob_opendir_hook) __P ((const char *directory));
const char *(*__glob_readdir_hook) __P ((__ptr_t stream));
void (*__glob_closedir_hook) __P ((__ptr_t stream));