* 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.

3 files changed, 12 insertions, 13 deletions

diff --git a/source/gameengine/Converter/KX_ConvertProperties.cpp b/source/gameengine/Converter/KX_ConvertProperties.cpp
index 5e8d6f3cbf0..1c22d2a0600 100644
--- a/source/gameengine/Converter/KX_ConvertProperties.cpp
+++ b/source/gameengine/Converter/KX_ConvertProperties.cpp
@@ -32,26 +32,26 @@
 #include <config.h>
 #endif
 
-/* This little block needed for linking to Blender... */
-#ifdef WIN32
-#include "BLI_winstuff.h"
-#endif
 
 #include "DNA_object_types.h"
 #include "DNA_property_types.h"
 /* end of blender include block */
 
+
 #include "Value.h"
 #include "VectorValue.h"
 #include "BoolValue.h"
 #include "StringValue.h"
 #include "FloatValue.h"
 #include "KX_GameObject.h"
-//#include "ListValue.h"
 #include "IntValue.h"
 #include "SCA_TimeEventManager.h"
 #include "SCA_IScene.h"
 
+/* This little block needed for linking to Blender... */
+#ifdef WIN32
+#include "BLI_winstuff.h"
+#endif
 
 void BL_ConvertProperties(Object* object,KX_GameObject* gameobj,SCA_TimeEventManager* timemgr,SCA_IScene* scene, bool isInActiveLayer)
 {
diff --git a/source/gameengine/Ketsji/KX_PythonInit.cpp b/source/gameengine/Ketsji/KX_PythonInit.cpp
index 9e81bcb3871..298d485aaaf 100644
--- a/source/gameengine/Ketsji/KX_PythonInit.cpp
+++ b/source/gameengine/Ketsji/KX_PythonInit.cpp
@@ -32,11 +32,6 @@
 
 // directory header for py function getBlendFileList
 #include <stdlib.h>
-#ifndef WIN32
-  #include <dirent.h>
-#else
-  #include "BLI_winstuff.h"
-#endif
 
 #ifdef WIN32
 #pragma warning (disable : 4786)
@@ -80,8 +75,6 @@ extern "C" {
 #include "InputParser.h"
 #include "KX_Scene.h"
 
-#include "NG_NetworkScene.h" //Needed for sendMessage()
-
 #include "BL_Shader.h"
 
 #include "KX_PyMath.h"
@@ -111,6 +104,13 @@ extern "C" {
 #include "BLI_blenlib.h"
 #include "GPU_material.h"
 
+#ifndef WIN32
+  #include <dirent.h>
+#else
+  #include "BLI_winstuff.h"
+#endif
+#include "NG_NetworkScene.h" //Needed for sendMessage()
+
 static void setSandbox(TPythonSecurityLevel level);
 
 // 'local' copy of canvas ptr, for window height/width python scripts
diff --git a/source/gameengine/VideoTexture/SConscript b/source/gameengine/VideoTexture/SConscript
index 0d3e495f3e2..119bd1c9954 100644
--- a/source/gameengine/VideoTexture/SConscript
+++ b/source/gameengine/VideoTexture/SConscript
@@ -25,6 +25,5 @@ incs += ' ' + env['BF_PYTHON_INC']
 if env['WITH_BF_FFMPEG']:
     defs.append('WITH_FFMPEG')
     incs += ' ' + env['BF_FFMPEG_INC'] + ' ' + env['BF_PTHREADS_INC']
-    defs.append('__STDC_CONSTANT_MACROS')
 
 env.BlenderLib ( 'bf_videotex', sources, Split(incs), defs, libtype=['core','player'], priority=[300,205], cxx_compileflags=env['BGE_CXXFLAGS'])