* doing some warning cleaning
authorNathan Letwory <nathan@letworyinteractive.com>
Tue, 4 Nov 2008 23:46:01 +0000 (23:46 +0000)
committerNathan Letwory <nathan@letworyinteractive.com>
Tue, 4 Nov 2008 23:46:01 +0000 (23:46 +0000)
* accidently left priority tests around.

extern/libopenjpeg/SConscript
extern/libredcode/SConscript
source/blender/blenkernel/intern/blender.c
source/blender/blenkernel/intern/exotic.c
source/blender/imbuf/intern/amiga.c
source/blender/imbuf/intern/readimage.c
source/blender/imbuf/intern/util.c

index 7100ecb37fd64e0c70dd148a2c1035ec3c9f9bd9..837701eeae0c3416ce316447ffddc23232f88f0b 100644 (file)
@@ -21,4 +21,4 @@ oj_env.BlenderLib ( libname='extern_openjpeg',
                     sources=sources, includes=Split(incs),
                     defines=[],
                     libtype=['core','intern','player'],
-                    priority=[5, 10, 200], compileflags = flags)
+                    priority=[10, 10, 300], compileflags = flags)
index b58e6d5fe254662d684f7208cd2ea25ff461e5c1..9fd25ad63c7478ba2cd5ac5d9f8fcc0503bdd830 100644 (file)
@@ -13,4 +13,4 @@ env.BlenderLib ( libname='extern_redcode',
                  sources=sources, includes=Split(incs),
                  defines=[],
                  libtype=['core','intern','player'],
-                 priority=[10, 5, 300], compileflags = [])
+                 priority=[5, 5, 200], compileflags = [])
index 1fe6447752e72f37dd51c11d09663925e3b7cb19..5dcccc56d06223841d8d47c115eb68a917f38355 100644 (file)
  * ***** 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>
index 9fb8d17d730da2b794da9d9270e723ad38dc24cf..ee3fd59fe9fd5c6cf6cd042c55b9d9a017a3e085 100644 (file)
 #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"
index 3d52a287a31d9bb24c5704f962a40d0e4d555660..534e4945aa34fd3dbd5e54d0c33a056c5a33562d 100644 (file)
  * ***** 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"
index 566df53a25e6033ca261bc1a9bfdc7ed25206e0a..05e7921665bc2707fbda9fe2f59602a0bb52c976 100644 (file)
  * $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"
index 231d7254224cba1a289062775707585fe7928260..c86f9b017bf295392ca35b0c4b9300e79f8b2dc2 100644 (file)
  * $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 AVCodecContext* get_codec_from_stream(AVStream* stream)
 
 static int isffmpeg (char *filename) {
        AVFormatContext *pFormatCtx;
-       int            i, videoStream;
+       unsigned int i;
+       int videoStream;
        AVCodec *pCodec;
        AVCodecContext *pCodecCtx;