Fix:build:Made supplied wordexp compatible with MSVC

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@3728 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/navit/support/wordexp/glob.h b/navit/navit/support/wordexp/glob.h
index ad49bbf..17f43eb 100644 (file)
--- a/navit/navit/support/wordexp/glob.h
+++ b/navit/navit/support/wordexp/glob.h
@@ -2,7 +2,7 @@
 #define _GLOB_H_
 
 #ifndef HAVE_GLOB
-#ifdef __MINGW32__
+#if defined __MINGW32__ || defined _MSC_VER
 
 typedef struct {
   size_t   gl_pathc;  /* count of file names */
@@ -13,7 +13,7 @@ typedef struct {
 int  glob(const char *pattern, int flags, int (*errfunc)(const char *epath, int eerrno), glob_t *pglob);
 void globfree(glob_t *pglob);
 
-#endif
+#endif /* defined __MINGW32__ || defined _MSC_VER */
 #endif
 
 #endif /* _GLOB_H_ */

diff --git a/navit/navit/support/wordexp/wordexp.c b/navit/navit/support/wordexp/wordexp.c
index 868b482..d901b13 100644 (file)
--- a/navit/navit/support/wordexp/wordexp.c
+++ b/navit/navit/support/wordexp/wordexp.c
@@ -7,7 +7,9 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#ifndef _MSC_VER
 #include <unistd.h>
+#endif /* _MSC_VER */
 #include "wordexp.h"
 #include "glob.h"