From dbb13c07cc64ae087d4eaace76df9d65c1034867 Mon Sep 17 00:00:00 2001 From: Joshua Leung Date: Mon, 10 Dec 2007 23:25:21 +0000 Subject: [PATCH] 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. --- source/blender/blenlib/BLI_arithb.h | 4 +++- source/blender/src/drawimasel.c | 3 ++- source/blender/src/filesel.c | 12 ++++++------ 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/source/blender/blenlib/BLI_arithb.h b/source/blender/blenlib/BLI_arithb.h index 1e86f8fe5b3..54999b1f72b 100644 --- a/source/blender/blenlib/BLI_arithb.h +++ b/source/blender/blenlib/BLI_arithb.h @@ -55,7 +55,9 @@ extern "C" { #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},\ diff --git a/source/blender/src/drawimasel.c b/source/blender/src/drawimasel.c index 257c5831813..88b6beb54c5 100644 --- a/source/blender/src/drawimasel.c +++ b/source/blender/src/drawimasel.c @@ -51,10 +51,11 @@ #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" diff --git a/source/blender/src/filesel.c b/source/blender/src/filesel.c index 599c6d5aae2..4789cc1d7bb 100644 --- a/source/blender/src/filesel.c +++ b/source/blender/src/filesel.c @@ -34,6 +34,12 @@ #include #include +#include +#include +#include "MEM_guardedalloc.h" + +#include "BMF_Api.h" + #ifdef WIN32 #include #include @@ -43,12 +49,6 @@ #include #endif -#include -#include -#include "MEM_guardedalloc.h" - -#include "BMF_Api.h" - #include "BLI_blenlib.h" #include "BLI_arithb.h" #include "BLI_linklist.h"