From c14f21a483ae4bc26ca5e391df9e5dbcb721a382 Mon Sep 17 00:00:00 2001 From: Doke Scott Date: Wed, 19 Aug 2015 18:28:39 -0400 Subject: [PATCH] more mingw32 can't find glob.h --- src/config/syscheck-config.c | 7 +++++++ src/headers/shared.h | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/config/syscheck-config.c b/src/config/syscheck-config.c index e2304824a..4d492dd7c 100644 --- a/src/config/syscheck-config.c +++ b/src/config/syscheck-config.c @@ -367,6 +367,10 @@ static int read_attr(syscheck_config *syscheck, const char *dirs, char **g_attrs } /* Check for glob */ + /* The mingw32 builder used by travis.ci can't find glob.h + * Yet glob must work on actual win32. + */ +#ifndef __MINGW32__ if (strchr(tmp_dir, '*') || strchr(tmp_dir, '?') || strchr(tmp_dir, '[')) { @@ -396,6 +400,9 @@ static int read_attr(syscheck_config *syscheck, const char *dirs, char **g_attrs else { dump_syscheck_entry(syscheck, tmp_dir, opts, 0, restrictfile); } +#else + dump_syscheck_entry(syscheck, tmp_dir, opts, 0, restrictfile); +#endif if (restrictfile) { free(restrictfile); diff --git a/src/headers/shared.h b/src/headers/shared.h index 0e012d9fd..498ae68b1 100644 --- a/src/headers/shared.h +++ b/src/headers/shared.h @@ -61,7 +61,9 @@ #include #include -/* the mingw32 builder used by travis.ci can't find glob.h */ +/* The mingw32 builder used by travis.ci can't find glob.h + * Yet glob must work on actual win32. + */ #ifndef __MINGW32__ #include #endif