summaryrefslogtreecommitdiff
path: root/openbsd-compat
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-03-17 01:15:38 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-03-17 01:15:38 +0000
commit45b14dbddc244bba8c17d71186c2bc49b355636a (patch)
tree379b4872dcd775fc18feff237342aa331d63031a /openbsd-compat
parent7bb8b49596156b85df403d09c2195e2533ec372c (diff)
- Check for gl_matchc support in glob_t and fall back to the
openbsd-compat/glob.[ch] support if it does not exist.
Diffstat (limited to 'openbsd-compat')
-rw-r--r--openbsd-compat/glob.c6
-rw-r--r--openbsd-compat/glob.h6
2 files changed, 8 insertions, 4 deletions
diff --git a/openbsd-compat/glob.c b/openbsd-compat/glob.c
index 2e255186..e2fd7c27 100644
--- a/openbsd-compat/glob.c
+++ b/openbsd-compat/glob.c
@@ -37,7 +37,8 @@
#include "includes.h"
#include <ctype.h>
-#if !defined(HAVE_GLOB) || !defined(GLOB_HAS_ALTDIRFUNC)
+#if !defined(HAVE_GLOB) || !defined(GLOB_HAS_ALTDIRFUNC) || \
+ !defined(GLOB_HAS_GL_MATCHC)
#if defined(LIBC_SCCS) && !defined(lint)
#if 0
@@ -855,5 +856,6 @@ qprintf(str, s)
}
#endif
-#endif /* !defined(HAVE_GLOB) || !defined(GLOB_HAS_ALTDIRFUNC) */
+#endif /* !defined(HAVE_GLOB) || !defined(GLOB_HAS_ALTDIRFUNC) ||
+ !defined(GLOB_HAS_GL_MATCHC) */
diff --git a/openbsd-compat/glob.h b/openbsd-compat/glob.h
index 392c63b6..a08cee57 100644
--- a/openbsd-compat/glob.h
+++ b/openbsd-compat/glob.h
@@ -39,7 +39,8 @@
* @(#)glob.h 8.1 (Berkeley) 6/2/93
*/
-#if !defined(HAVE_GLOB_H) || !defined(GLOB_HAS_ALTDIRFUNC)
+#if !defined(HAVE_GLOB_H) || !defined(GLOB_HAS_ALTDIRFUNC) || \
+ !defined(GLOB_HAS_GL_MATCHC)
#ifndef _GLOB_H_
#define _GLOB_H_
@@ -94,5 +95,6 @@ void globfree __P((glob_t *));
#endif /* !_GLOB_H_ */
-#endif /* !defined(HAVE_GLOB_H) || !defined(GLOB_HAS_ALTDIRFUNC) */
+#endif /* !defined(HAVE_GLOB_H) || !defined(GLOB_HAS_ALTDIRFUNC) ||
+ !defined(GLOB_HAS_GL_MATCHC */