From 53f93ef66d6821249cedbb38e9a7a714bd361890 Mon Sep 17 00:00:00 2001
From: Antony Riakiotakis <kalast@gmail.com>
Date: Tue, 14 Jan 2014 23:57:00 +0200
Subject: Fix build issues with mingw's

---
 source/blender/blenlib/BLI_winstuff.h        | 8 +++++++-
 source/blender/blenlib/intern/winstuff_dir.c | 2 +-
 source/blender/datatoc/datatoc_icon.c        | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

(limited to 'source')

diff --git a/source/blender/blenlib/BLI_winstuff.h b/source/blender/blenlib/BLI_winstuff.h
index 13a946ac370..1959d5171fb 100644
--- a/source/blender/blenlib/BLI_winstuff.h
+++ b/source/blender/blenlib/BLI_winstuff.h
@@ -127,6 +127,10 @@ typedef long ssize_t;
 #  endif
 #endif
 
+
+#ifdef FREE_WINDOWS
+#include <dirent.h>
+#else
 struct dirent {
 	int d_ino;
 	int d_off;
@@ -146,10 +150,12 @@ typedef struct _DIR {
 	struct dirent direntry;
 } DIR;
 
-void RegisterBlendExtension(void);
 DIR *opendir(const char *path);
 struct dirent *readdir(DIR *dp);
 int closedir(DIR *dp);
+#endif
+
+void RegisterBlendExtension(void);
 void get_default_root(char *root);
 int check_file_chars(char *filename);
 const char *dirname(char *path);
diff --git a/source/blender/blenlib/intern/winstuff_dir.c b/source/blender/blenlib/intern/winstuff_dir.c
index 5cd2baa033c..4082681ee11 100644
--- a/source/blender/blenlib/intern/winstuff_dir.c
+++ b/source/blender/blenlib/intern/winstuff_dir.c
@@ -25,7 +25,7 @@
  *  \ingroup bli
  */
 
-#ifdef WIN32
+#if defined(WIN32) && !defined(FREE_WINDOWS)
 
 #  ifdef USE_STANDALONE
 #    define MEM_mallocN(size, str) ((void)str, malloc(size))
diff --git a/source/blender/datatoc/datatoc_icon.c b/source/blender/datatoc/datatoc_icon.c
index e4b00388dba..59c9eeb3ed1 100644
--- a/source/blender/datatoc/datatoc_icon.c
+++ b/source/blender/datatoc/datatoc_icon.c
@@ -32,7 +32,7 @@
 #include "../blenlib/BLI_sys_types.h"
 
 /* for DIR */
-#if !defined(WIN32) || defined(__MINGW64__)
+#if !defined(WIN32) || defined(FREEWINDOWS)
 #  include <dirent.h>
 #endif
 
-- 
cgit v1.2.3