Don't let the fnmatch/glob macros expand the function prototype.

diff --git a/compat/fnmatch.h b/compat/fnmatch.h
index 2c310796d547a76f1949856a2b4a9f3249c2a0e7..b7504ce460ab2a4b16f3ad65edfddca551571962 100644 (file)
--- a/compat/fnmatch.h
+++ b/compat/fnmatch.h
@@ -41,8 +41,8 @@
 #define        FNM_LEADING_DIR 0x08    /* Ignore /<tail> after Imatch. */
 #define        FNM_CASEFOLD    0x10    /* Case insensitive search. */
 
-#define fnmatch(_a, _b, _c)    rpl_fnmatch((_a), (_b), (_c))
+int     rpl_fnmatch(const char *, const char *, int);
 
-int     fnmatch(const char *, const char *, int);
+#define fnmatch(_a, _b, _c)    rpl_fnmatch((_a), (_b), (_c))
 
 #endif /* !_FNMATCH_H_ */

diff --git a/compat/glob.h b/compat/glob.h
index 8279b796c81d7b19c5f2d84ea860e8502a623266..7e7153b30fe4e64825135a870402635b6d289323 100644 (file)
--- a/compat/glob.h
+++ b/compat/glob.h
@@ -69,10 +69,10 @@ typedef struct {
 #define        GLOB_NOSYS      (-4)    /* Function not supported. */
 #define GLOB_ABEND     GLOB_ABORTED
 
+int    rpl_glob(const char *, int, int (*)(const char *, int), glob_t *);
+void   rpl_globfree(glob_t *);
+
 #define glob(_a, _b, _c, _d) rpl_glob((_a), (_b), (_c), (_d))
 #define globfree(_a) rpl_globfree((_a))
 
-int    glob(const char *, int, int (*)(const char *, int), glob_t *);
-void   globfree(glob_t *);
-
 #endif /* !_GLOB_H_ */