more mingw32 can't find glob.h

doke2 · Aug 19, 2015 · c14f21a · c14f21a
1 parent d0c1a4b
commit c14f21a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git 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
@@ -61,7 +61,9 @@
 #include <ctype.h>
 #include <signal.h>
 
-/* 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 <glob.h>
 #endif