diff options
Diffstat (limited to 'source/blender/src')
| -rw-r--r-- | source/blender/src/editimasel.c | 6 | ||||
| -rw-r--r-- | source/blender/src/filesel.c | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/source/blender/src/editimasel.c b/source/blender/src/editimasel.c index abc19b53671..d57df3aaccf 100644 --- a/source/blender/src/editimasel.c +++ b/source/blender/src/editimasel.c @@ -117,12 +117,14 @@ static int imasel_has_func(SpaceImaSel *simasel) return 0; } -/* ugly, needs to be moved to platform specific files - elubie */ -#if defined WIN32 || defined __BeOS +#if defined __BeOS static int fnmatch(const char *pattern, const char *string, int flags) { return 0; } +#elif defined WIN32 && !defined _LIBC + /* use fnmatch included in blenlib */ + #include "BLI_fnmatch.h" #else #include <fnmatch.h> #endif diff --git a/source/blender/src/filesel.c b/source/blender/src/filesel.c index 10f234fcd21..599c6d5aae2 100644 --- a/source/blender/src/filesel.c +++ b/source/blender/src/filesel.c @@ -116,11 +116,14 @@ #include "FTF_Api.h" #endif -#if defined WIN32 || defined __BeOS +#if defined __BeOS static int fnmatch(const char *pattern, const char *string, int flags) { return 0; } +#elif defined WIN32 && !defined _LIBC + /* use fnmatch included in blenlib */ + #include "BLI_fnmatch.h" #else #include <fnmatch.h> #endif |