[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12839] trunk/blender/source/blender: Fixing compiler warnings:
Joshua Leung
aligorith at gmail.com
Tue Dec 11 00:25:21 CET 2007
Revision: 12839
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12839
Author: aligorith
Date: 2007-12-11 00:25:21 +0100 (Tue, 11 Dec 2007)
Log Message:
-----------
Fixing compiler warnings:
* BLI_arithb.h - isnan definition is only needed for MSVC, but gcc/mingw complains about it
* file-selectors - moved BLI_storage_types.h or sys/stat.h includes before BLI_winstuff.h includes, to silence warnings about S_ISDIR.
Modified Paths:
--------------
trunk/blender/source/blender/blenlib/BLI_arithb.h
trunk/blender/source/blender/src/drawimasel.c
trunk/blender/source/blender/src/filesel.c
Modified: trunk/blender/source/blender/blenlib/BLI_arithb.h
===================================================================
--- trunk/blender/source/blender/blenlib/BLI_arithb.h 2007-12-10 21:14:19 UTC (rev 12838)
+++ trunk/blender/source/blender/blenlib/BLI_arithb.h 2007-12-10 23:25:21 UTC (rev 12839)
@@ -55,7 +55,9 @@
#endif
#ifdef WIN32
- #define isnan(n) _isnan(n)
+ #ifndef FREE_WINDOWS
+ #define isnan(n) _isnan(n)
+ #endif
#endif
#define MAT4_UNITY {{ 1.0, 0.0, 0.0, 0.0},\
Modified: trunk/blender/source/blender/src/drawimasel.c
===================================================================
--- trunk/blender/source/blender/src/drawimasel.c 2007-12-10 21:14:19 UTC (rev 12838)
+++ trunk/blender/source/blender/src/drawimasel.c 2007-12-10 23:25:21 UTC (rev 12839)
@@ -51,11 +51,12 @@
#include "DNA_material_types.h"
#include "BLI_blenlib.h"
+#include "BLI_storage_types.h"
#ifdef WIN32
#include "BLI_winstuff.h"
#endif
-#include "BLI_storage_types.h"
+
#include "BKE_global.h"
#include "BKE_library.h"
#include "BKE_icons.h"
Modified: trunk/blender/source/blender/src/filesel.c
===================================================================
--- trunk/blender/source/blender/src/filesel.c 2007-12-10 21:14:19 UTC (rev 12838)
+++ trunk/blender/source/blender/src/filesel.c 2007-12-10 23:25:21 UTC (rev 12839)
@@ -34,6 +34,12 @@
#include <string.h>
#include <math.h>
+#include <sys/stat.h>
+#include <sys/types.h>
+#include "MEM_guardedalloc.h"
+
+#include "BMF_Api.h"
+
#ifdef WIN32
#include <io.h>
#include <direct.h>
@@ -43,12 +49,6 @@
#include <sys/times.h>
#endif
-#include <sys/stat.h>
-#include <sys/types.h>
-#include "MEM_guardedalloc.h"
-
-#include "BMF_Api.h"
-
#include "BLI_blenlib.h"
#include "BLI_arithb.h"
#include "BLI_linklist.h"
More information about the Bf-blender-cvs
mailing list