From fb649d5824ccccca544c905209ba64340dc1bded Mon Sep 17 00:00:00 2001
From: Nathan Letwory <nathan@letworyinteractive.com>
Date: Sun, 6 Sep 2009 13:20:05 +0000
Subject: * cleaning up warnings (mostly windows). A collection of other
 warning fixes too (undefined function, assuming int, etc.)

This compiled fine with scons/msvc and scons/mingw (gcc 4.4.0). Please test and report any problems.
---
 source/blender/imbuf/intern/anim5.c      |  6 ++++++
 source/blender/imbuf/intern/hamx.c       | 10 +++++-----
 source/blender/imbuf/intern/iff.c        |  7 ++++---
 source/blender/imbuf/intern/thumbs.c     | 20 +++++++++-----------
 source/blender/imbuf/intern/writeimage.c |  8 ++++----
 5 files changed, 28 insertions(+), 23 deletions(-)

(limited to 'source/blender/imbuf/intern')

diff --git a/source/blender/imbuf/intern/anim5.c b/source/blender/imbuf/intern/anim5.c
index b6f29b6a145..4fe4217cd2c 100644
--- a/source/blender/imbuf/intern/anim5.c
+++ b/source/blender/imbuf/intern/anim5.c
@@ -31,6 +31,7 @@
 
 #include "BLI_blenlib.h" /* BLI_remlink BLI_filesize BLI_addtail
                             BLI_countlist BLI_stringdec */
+
 #include "imbuf.h"
 #include "imbuf_patch.h"
 
@@ -46,6 +47,11 @@
 
 #include "IMB_anim5.h"
 
+#ifdef _WIN32
+#include <io.h>
+#include "BLI_winstuff.h"
+#endif
+
 typedef struct Anhd{
 	unsigned char type, mask;
 	unsigned short w, h;
diff --git a/source/blender/imbuf/intern/hamx.c b/source/blender/imbuf/intern/hamx.c
index 2f32d155407..258c196fcdf 100644
--- a/source/blender/imbuf/intern/hamx.c
+++ b/source/blender/imbuf/intern/hamx.c
@@ -31,11 +31,6 @@
 
 #include "BLI_blenlib.h"
 
-#ifdef WIN32
-#include <io.h>
-#endif
-
-
 #include "imbuf.h"
 #include "imbuf_patch.h"
 #include "IMB_imbuf_types.h"
@@ -46,6 +41,11 @@
 #include "IMB_ham.h"
 #include "IMB_hamx.h"
 
+#ifdef WIN32
+#include <io.h>
+#include "BLI_winstuff.h"
+#endif
+
 /* actually hard coded endianness */
 #define GET_BIG_LONG(x) (((uchar *) (x))[0] << 24 | ((uchar *) (x))[1] << 16 | ((uchar *) (x))[2] << 8 | ((uchar *) (x))[3])
 #define GET_LITTLE_LONG(x) (((uchar *) (x))[3] << 24 | ((uchar *) (x))[2] << 16 | ((uchar *) (x))[1] << 8 | ((uchar *) (x))[0])
diff --git a/source/blender/imbuf/intern/iff.c b/source/blender/imbuf/intern/iff.c
index c3695173068..5fd823e78c1 100644
--- a/source/blender/imbuf/intern/iff.c
+++ b/source/blender/imbuf/intern/iff.c
@@ -29,14 +29,15 @@
  * $Id$
  */
 
-#ifdef WIN32
-#include <io.h>
-#endif
 #include "BLI_blenlib.h"
 #include "imbuf.h"
 #include "imbuf_patch.h"
 #include "IMB_imbuf_types.h"
 #include "IMB_iff.h"
+#ifdef WIN32
+#include <io.h>
+#include "BLI_winstuff.h"
+#endif
 
 unsigned short imb_start_iff(struct ImBuf *ibuf, int file)
 {
diff --git a/source/blender/imbuf/intern/thumbs.c b/source/blender/imbuf/intern/thumbs.c
index 86ca43824f3..6053c5556f1 100644
--- a/source/blender/imbuf/intern/thumbs.c
+++ b/source/blender/imbuf/intern/thumbs.c
@@ -39,31 +39,29 @@
 #include "IMB_thumbs.h"
 #include "IMB_imginfo.h"
 
-
 #include "md5.h"
 
+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <stdio.h>
+
 #ifdef WIN32
 #include <windows.h> /* need to include windows.h so _WIN32_IE is defined  */
 #ifndef _WIN32_IE
 #define _WIN32_IE 0x0400 /* minimal requirements for SHGetSpecialFolderPath on MINGW MSVC has this defined already */
 #endif
 #include <shlobj.h> /* for SHGetSpecialFolderPath, has to be done before BLI_winstuff because 'near' is disabled through BLI_windstuff */
-#include "BLI_winstuff.h"
 #include <process.h> /* getpid */
 #include <direct.h> /* chdir */
+#include "BLI_winstuff.h"
 #else
 #include <unistd.h>
 #endif
 
-#include <ctype.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <time.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <stdio.h>
-
 #define URI_MAX FILE_MAX*3 + 8
 
 static int get_thumb_dir( char* dir , ThumbSize size)
diff --git a/source/blender/imbuf/intern/writeimage.c b/source/blender/imbuf/intern/writeimage.c
index 7e1120bf3e4..b3af727190a 100644
--- a/source/blender/imbuf/intern/writeimage.c
+++ b/source/blender/imbuf/intern/writeimage.c
@@ -29,10 +29,6 @@
  * $Id$
  */
 
-#ifdef WIN32
-#include <io.h>
-#endif
-
 #include <stdio.h>
 
 #include "BKE_global.h"
@@ -71,6 +67,10 @@
 #include "IMB_bitplanes.h"
 #include "IMB_divers.h"
 
+#ifdef WIN32
+#include <io.h>
+#include "BLI_winstuff.h"
+#endif
 /* added facility to copy with saving non-float rects */
 
 short IMB_saveiff(struct ImBuf *ibuf, char *name, int flags)
-- 
cgit v1.2.3