summaryrefslogtreecommitdiff
path: root/glob
diff options
context:
space:
mode:
Diffstat (limited to 'glob')
-rw-r--r--glob/ChangeLog5
-rw-r--r--glob/fnmatch.h4
-rw-r--r--glob/glob.c5
-rw-r--r--glob/glob.h2
4 files changed, 9 insertions, 7 deletions
diff --git a/glob/ChangeLog b/glob/ChangeLog
index e4879b5..18c3172 100644
--- a/glob/ChangeLog
+++ b/glob/ChangeLog
@@ -1,3 +1,8 @@
+2005-06-25 Paul D. Smith <psmith@gnu.org>
+
+ * fnmatch.h, glob.h [WINDOWS32]: Fix ifdefs in headers.
+ Fixes Savannah bug #13477.
+
2005-03-11 Paul D. Smith <psmith@gnu.org>
* glob.c (glob_in_dir): Change FNM_CASEFOLD to be enabled if
diff --git a/glob/fnmatch.h b/glob/fnmatch.h
index cc3ec37..54cbf59 100644
--- a/glob/fnmatch.h
+++ b/glob/fnmatch.h
@@ -24,7 +24,7 @@ extern "C" {
#endif
#if defined __cplusplus || (defined __STDC__ && __STDC__) || defined WINDOWS32
-# if !defined __GLIBC__ || !defined __P
+# if !defined __GLIBC__
# undef __P
# define __P(protos) protos
# endif
@@ -37,7 +37,7 @@ extern "C" {
#endif /* C++ or ANSI C. */
#ifndef const
-# if (defined __STDC__ && __STDC__) || defined __cplusplus
+# if (defined __STDC__ && __STDC__) || defined __cplusplus || defined WINDOWS32
# define __const const
# else
# define __const
diff --git a/glob/glob.c b/glob/glob.c
index 80d667c..20c48f7 100644
--- a/glob/glob.c
+++ b/glob/glob.c
@@ -299,11 +299,8 @@ static int glob_in_dir __P ((const char *pattern, const char *directory,
static int prefix_array __P ((const char *prefix, char **array, size_t n));
static int collated_compare __P ((const __ptr_t, const __ptr_t));
-#ifdef VMS
-/* these compilers like prototypes */
#if !defined _LIBC || !defined NO_GLOB_PATTERN_P
-int __glob_pattern_p (const char *pattern, int quote);
-#endif
+int __glob_pattern_p __P ((const char *pattern, int quote));
#endif
/* Find the end of the sub-pattern in a brace expression. We define
diff --git a/glob/glob.h b/glob/glob.h
index ca523f7..b307c25 100644
--- a/glob/glob.h
+++ b/glob/glob.h
@@ -24,7 +24,7 @@ extern "C" {
#undef __ptr_t
#if defined __cplusplus || (defined __STDC__ && __STDC__) || defined WINDOWS32
-# if !defined __GLIBC__ || !defined __P
+# if !defined __GLIBC__
# undef __P
# undef __PMT
# define __P(protos) protos