[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17328] trunk/blender: * doing some warning cleaning

[Nathan Letwory]

Revision: 17328
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17328
Author:   jesterking
Date:     2008-11-05 00:46:01 +0100 (Wed, 05 Nov 2008)

Log Message:
-----------
* doing some warning cleaning
* accidently left priority tests around.

Modified Paths:
--------------
    trunk/blender/extern/libopenjpeg/SConscript
    trunk/blender/extern/libredcode/SConscript
    trunk/blender/source/blender/blenkernel/intern/blender.c
    trunk/blender/source/blender/blenkernel/intern/exotic.c
    trunk/blender/source/blender/imbuf/intern/amiga.c
    trunk/blender/source/blender/imbuf/intern/readimage.c
    trunk/blender/source/blender/imbuf/intern/util.c

Modified: trunk/blender/extern/libopenjpeg/SConscript
===================================================================
--- trunk/blender/extern/libopenjpeg/SConscript	2008-11-04 23:04:15 UTC (rev 17327)
+++ trunk/blender/extern/libopenjpeg/SConscript	2008-11-04 23:46:01 UTC (rev 17328)
@@ -21,4 +21,4 @@
                     sources=sources, includes=Split(incs),
                     defines=[],
                     libtype=['core','intern','player'],
-                    priority=[5, 10, 200], compileflags = flags)
+                    priority=[10, 10, 300], compileflags = flags)

Modified: trunk/blender/extern/libredcode/SConscript
===================================================================
--- trunk/blender/extern/libredcode/SConscript	2008-11-04 23:04:15 UTC (rev 17327)
+++ trunk/blender/extern/libredcode/SConscript	2008-11-04 23:46:01 UTC (rev 17328)
@@ -13,4 +13,4 @@
                  sources=sources, includes=Split(incs),
                  defines=[],
                  libtype=['core','intern','player'],
-                 priority=[10, 5, 300], compileflags = [])
+                 priority=[5, 5, 200], compileflags = [])

Modified: trunk/blender/source/blender/blenkernel/intern/blender.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/blender.c	2008-11-04 23:04:15 UTC (rev 17327)
+++ trunk/blender/source/blender/blenkernel/intern/blender.c	2008-11-04 23:46:01 UTC (rev 17328)
@@ -30,11 +30,15 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#ifndef WIN32 
-    #include <unistd.h> // for read close
-    #include <sys/param.h> // for MAXPATHLEN
+#ifndef _WIN32 
+	#include <unistd.h> // for read close
+	#include <sys/param.h> // for MAXPATHLEN
 #else
-    #include <io.h> // for open close read
+	#include <io.h> // for open close read
+	#define open _open
+	#define read _read
+	#define close _close
+	#define write _write
 #endif
 
 #include <stdlib.h>

Modified: trunk/blender/source/blender/blenkernel/intern/exotic.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/exotic.c	2008-11-04 23:04:15 UTC (rev 17327)
+++ trunk/blender/source/blender/blenkernel/intern/exotic.c	2008-11-04 23:46:01 UTC (rev 17328)
@@ -76,10 +76,14 @@
 #include <fcntl.h>
 #include <string.h>
 
-#ifndef WIN32 
+#ifndef _WIN32 
 #include <unistd.h>
 #else
 #include <io.h>
+#define open _open
+#define read _read
+#define close _close
+#define write _write
 #endif
 
 #include "MEM_guardedalloc.h"

Modified: trunk/blender/source/blender/imbuf/intern/amiga.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/amiga.c	2008-11-04 23:04:15 UTC (rev 17327)
+++ trunk/blender/source/blender/imbuf/intern/amiga.c	2008-11-04 23:46:01 UTC (rev 17328)
@@ -29,8 +29,12 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <io.h>
+#define open _open
+#define read _read
+#define close _close
+#define write _write
 #endif
 #include "imbuf.h"
 #include "imbuf_patch.h"

Modified: trunk/blender/source/blender/imbuf/intern/readimage.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/readimage.c	2008-11-04 23:04:15 UTC (rev 17327)
+++ trunk/blender/source/blender/imbuf/intern/readimage.c	2008-11-04 23:46:01 UTC (rev 17328)
@@ -29,11 +29,14 @@
  * $Id$
  */
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <io.h>
 #include <stddef.h>
 #include <sys/types.h>
 #include "mmap_win.h"
+#define open _open
+#define read _read
+#define close _close
 #endif
 
 #include "BLI_blenlib.h"

Modified: trunk/blender/source/blender/imbuf/intern/util.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/util.c	2008-11-04 23:04:15 UTC (rev 17327)
+++ trunk/blender/source/blender/imbuf/intern/util.c	2008-11-04 23:46:01 UTC (rev 17328)
@@ -29,6 +29,13 @@
  * $Id$
  */
 
+#ifdef _WIN32
+#include <io.h>
+#define open _open
+#define read _read
+#define close _close
+#endif
+
 #include "BLI_blenlib.h"
 
 #include "DNA_userdef_types.h"
@@ -275,7 +282,8 @@
 
 static int isffmpeg (char *filename) {
 	AVFormatContext *pFormatCtx;
-	int            i, videoStream;
+	unsigned int i;
+	int videoStream;
 	AVCodec *pCodec;
 	AVCodecContext *pCodecCtx;