Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2012-04-15 11:54:07 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-04-15 11:54:07 +0400
commita73d0d3e72940ecd0e3e60c8e4e858c7e00ff5e2 (patch)
tree554c462fa090dad417a0e0371a7647007c33b1ba /source/blender/blenkernel/intern
parenta8077c8222876bdc67cfbc9ae56b04a12c8657e9 (diff)
code cleanup: dont include BLI_winstuff.h on non windows systems, also cleanup some defines/includes for windows.
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r--source/blender/blenkernel/intern/depsgraph.c5
-rw-r--r--source/blender/blenkernel/intern/screen.c4
-rw-r--r--source/blender/blenkernel/intern/unit.c5
3 files changed, 11 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c
index 39fa5d2f7e7..366e808d32c 100644
--- a/source/blender/blenkernel/intern/depsgraph.c
+++ b/source/blender/blenkernel/intern/depsgraph.c
@@ -34,7 +34,10 @@
#include "MEM_guardedalloc.h"
-#include "BLI_winstuff.h"
+#ifdef WIN32
+# include "BLI_winstuff.h"
+#endif
+
#include "BLI_utildefines.h"
#include "BLI_listbase.h"
#include "BLI_ghash.h"
diff --git a/source/blender/blenkernel/intern/screen.c b/source/blender/blenkernel/intern/screen.c
index 158fc91c03c..af0c5eae9a8 100644
--- a/source/blender/blenkernel/intern/screen.c
+++ b/source/blender/blenkernel/intern/screen.c
@@ -30,7 +30,9 @@
* \ingroup bke
*/
-#include "BLI_winstuff.h"
+#ifdef WIN32
+# include "BLI_winstuff.h"
+#endif
#include <string.h>
#include <stdio.h>
diff --git a/source/blender/blenkernel/intern/unit.c b/source/blender/blenkernel/intern/unit.c
index b3c979afac4..7a71853641d 100644
--- a/source/blender/blenkernel/intern/unit.c
+++ b/source/blender/blenkernel/intern/unit.c
@@ -34,7 +34,10 @@
#include "BLI_math.h"
#include "BLI_string.h"
#include "BLI_string_utf8.h"
-#include "BLI_winstuff.h"
+
+#ifdef WIN32
+# include "BLI_winstuff.h"
+#endif
#define TEMP_STR_SIZE 256