- WITH_CXX_GUARDEDALLOC working again

- CMake building without python or fluidsim working again (broke in recent commit)
- remove BLI_short_filename(), it wasnt used anywhere.

intern/string/STR_String.h

@@ -202,8 +202,8 @@ protected:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "CXX:STR_String"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "CXX:STR_String"); }
+	void operator delete(void *mem) { MEM_freeN(mem); }
 #endif
 };
 

source/blender/blenlib/BLI_fileops.h

@@ -54,7 +54,6 @@ char *BLI_last_slash(const char *string);
 int	  BLI_add_slash(char *string);
 void  BLI_del_slash(char *string);
 char *first_slash(char *string);
-const char *BLI_short_filename(const char *string);
 
 /* only for the sane unix world: direct calls to system functions :( */
 #ifndef WIN32

source/blender/blenlib/intern/fileops.c

@@ -80,31 +80,6 @@ char *BLI_last_slash(const char *string) {
 	else return lfslash;
 }
 
-static const char *last_slash_len(const char *string, int len) {
-	int a;
-
-	for(a=len-1; a>=0; a--)
-		if(string[a] == '/' || string[a] == '\\')
-			return &string[a];
-	
-	return NULL;
-}
-
-const char *BLI_short_filename(const char *string) {
-	const char *ls, *lls;
-	
-	ls= last_slash_len(string, strlen(string));
-	if(!ls)
-		return string;
-	
-	lls= last_slash_len(string, ls-string);
-
-	if(lls)
-		return lls+1;
-	else
-		return ls+1;
-}
-
 /* adds a slash if there isnt one there alredy */
 int BLI_add_slash(char *string) {
 	int len = strlen(string);

source/blender/blenlib/intern/path_util.c

@@ -1175,7 +1175,7 @@ void BLI_join_dirfile(char *string, const char *dir, const char *file)
 /* like pythons os.path.basename( ) */
 char *BLI_path_basename(char *path)
 {
-	const char *filename= BLI_last_slash(path);
+	char *filename= BLI_last_slash(path);
 	return filename ? filename + 1 : path;
 }
 

source/blender/editors/interface/CMakeLists.txt

@@ -39,8 +39,8 @@ IF(WITH_INTERNATIONAL)
 	ADD_DEFINITIONS(-DINTERNATIONAL)
 ENDIF(WITH_INTERNATIONAL)
 
-IF(WITH_PYTHON)
+IF(NOT WITH_PYTHON)
 	ADD_DEFINITIONS(-DDISABLE_PYTHON)
-ENDIF(WITH_PYTHON)
+ENDIF(NOT WITH_PYTHON)
 
 BLENDERLIB(bf_editor_interface "${SRC}" "${INC}")

source/blender/editors/object/object_constraint.c

@@ -199,9 +199,9 @@ char *buildmenu_pyconstraints (Text *con_text, int *pyconindex)
 /* this callback gets called when the 'refresh' button of a pyconstraint gets pressed */
 void update_pyconstraint_cb (void *arg1, void *arg2)
 {
+#ifndef DISABLE_PYTHON
 	Object *owner= (Object *)arg1;
 	bConstraint *con= (bConstraint *)arg2;
-#ifndef DISABLE_PYTHON
 	if (owner && con)
 		BPY_pyconstraint_update(owner, con);
 #endif
@@ -1286,9 +1286,9 @@ static int constraint_add_exec(bContext *C, wmOperator *op, Object *ob, ListBase
 			
 		case CONSTRAINT_TYPE_PYTHON: // FIXME: this code is not really valid anymore
 		{
+#ifndef DISABLE_PYTHON
 			char *menustr;
 			int scriptint= 0;
-#ifndef DISABLE_PYTHON
 			/* popup a list of usable scripts */
 			menustr = buildmenu_pyconstraints(NULL, &scriptint);
 			// XXX scriptint = pupmenu(menustr);

source/blender/editors/physics/CMakeLists.txt

@@ -32,6 +32,10 @@ SET(INC
 	../../../../intern/guardedalloc
 )
 
+IF(NOT WITH_ELBEEM)
+	ADD_DEFINITIONS(-DDISABLE_ELBEEM)
+ENDIF(NOT WITH_ELBEEM)
+
 IF(WITH_OPENMP)
 		ADD_DEFINITIONS(-DPARALLEL=1)
 ENDIF(WITH_OPENMP)

source/blender/editors/space_script/script_edit.c

@@ -50,18 +50,17 @@
 
 #include "script_intern.h"	// own include
 
-
+#ifndef DISABLE_PYTHON
 #include "BPY_extern.h" /* BPY_run_python_script */
+#endif
 
 static int run_pyfile_exec(bContext *C, wmOperator *op)
 {
-	ARegion *ar= CTX_wm_region(C);
-	
-
 	char path[512];
 	RNA_string_get(op->ptr, "path", path);
 #ifndef DISABLE_PYTHON
 	if(BPY_run_python_script(C, path, NULL, op->reports)) {
+		ARegion *ar= CTX_wm_region(C);
 		ED_region_tag_redraw(ar);
 		return OPERATOR_FINISHED;
 	}

source/blender/editors/space_script/space_script.c

@@ -50,8 +50,9 @@
 #include "UI_resources.h"
 #include "UI_view2d.h"
 
-
+#ifndef DISABLE_PYTHON
 #include "BPY_extern.h"
+#endif
 
 #include "script_intern.h"	// own include
 

source/blender/makesrna/intern/rna_wm.c

@@ -611,6 +611,7 @@ static int rna_wmKeyMapItem_name_length(PointerRNA *ptr)
 		return 0;
 }
 
+#ifndef DISABLE_PYTHON
 static void rna_Operator_unregister(const bContext *C, StructRNA *type)
 {
 	char *idname;
@@ -746,7 +747,6 @@ static void operator_draw(bContext *C, wmOperator *op)
 	RNA_parameter_list_free(&list);
 }
 
-#ifndef DISABLE_PYTHON
 void operator_wrapper(wmOperatorType *ot, void *userdata);
 void macro_wrapper(wmOperatorType *ot, void *userdata);
 

source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp

@@ -166,7 +166,9 @@ extern "C" void StartKetsjiShell(struct bContext *C, struct ARegion *ar, rcti *c
 		bool frameRate = (SYS_GetCommandLineInt(syshandle, "show_framerate", 0) != 0);
 		bool animation_record = (SYS_GetCommandLineInt(syshandle, "animation_record", 0) != 0);
 		bool displaylists = (SYS_GetCommandLineInt(syshandle, "displaylists", 0) != 0);
+#ifndef DISABLE_PYTHON
 		bool nodepwarnings = (SYS_GetCommandLineInt(syshandle, "ignore_deprecation_warnings", 0) != 0);
+#endif
 		bool novertexarrays = (SYS_GetCommandLineInt(syshandle, "novertexarrays", 0) != 0);
 		if(animation_record) usefixed= true; /* override since you's always want fixed time for sim recording */
 

source/gameengine/BlenderRoutines/KX_BlenderCanvas.h

@@ -192,7 +192,7 @@ private:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BlenderCanvas"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BlenderCanvas"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/BlenderRoutines/KX_BlenderInputDevice.h

@@ -234,8 +234,8 @@ public:
 	
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_BlenderInputDevice"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_BlenderInputDevice"); }
+	void operator delete(void *mem) { MEM_freeN(mem); }
 #endif
 };                                                                                                                 
 #endif //__KX_BLENDERINPUTDEVICE

source/gameengine/BlenderRoutines/KX_BlenderKeyboardDevice.h

@@ -51,8 +51,8 @@ public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BlenderKeyboardDevice"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BlenderKeyboardDevice"); }
+	void operator delete(void *mem) { MEM_freeN(mem); }
 #endif
 };
 

source/gameengine/BlenderRoutines/KX_BlenderMouseDevice.h

@@ -49,8 +49,8 @@ public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BlenderMouseDevice"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BlenderMouseDevice"); }
+	void operator delete(void *mem) { MEM_freeN(mem); }
 #endif
 };
 

source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h

@@ -99,7 +99,7 @@ public:
 	
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BlenderRenderTools"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BlenderRenderTools"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/BlenderRoutines/KX_BlenderSystem.h

@@ -51,7 +51,7 @@ public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BlenderSystem"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BlenderSystem"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Converter/BL_DeformableGameObject.h

@@ -102,7 +102,7 @@ protected:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_DeformableGameObject"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_DeformableGameObject"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Converter/BL_MeshDeformer.h

@@ -89,7 +89,7 @@ protected:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_MeshDeformer"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_MeshDeformer"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Converter/BL_ModifierDeformer.h

@@ -105,7 +105,7 @@ protected:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_ModifierDeformer"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_ModifierDeformer"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Converter/BL_ShapeDeformer.h

@@ -86,7 +86,7 @@ protected:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_ShapeDeformer"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_ShapeDeformer"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Converter/BL_SkinDeformer.h

@@ -109,7 +109,7 @@ protected:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_SkinDeformer"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_SkinDeformer"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Converter/BlenderWorldInfo.h

@@ -98,7 +98,7 @@ public:
 	
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:BlenderWorldInfo"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BlenderWorldInfo"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Converter/KX_BlenderScalarInterpolator.h

@@ -53,7 +53,7 @@ private:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_ScalarInterpolator"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_ScalarInterpolator"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
@@ -69,7 +69,7 @@ public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_InterpolatorList"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_InterpolatorList"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Converter/KX_BlenderSceneConverter.h

@@ -178,7 +178,7 @@ public:
 	
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BlenderSceneConverter"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BlenderSceneConverter"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Converter/KX_SoftBodyDeformer.h

@@ -92,7 +92,7 @@ protected:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_ShapeDeformer"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_ShapeDeformer"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Expressions/BoolValue.h

@@ -55,7 +55,7 @@ private:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CBoolValue"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CBoolValue"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Expressions/ConstExpr.h

@@ -45,7 +45,7 @@ private:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CConstExpr"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CConstExpr"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Expressions/EmptyValue.h

@@ -38,7 +38,7 @@ public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CEmptyValue"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CEmptyValue"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Expressions/ErrorValue.h

@@ -37,7 +37,7 @@ private:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CErrorValue"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CErrorValue"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Expressions/Expression.h

@@ -66,7 +66,7 @@ class CBrokenLinkInfo
 	
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CBrokenLinkInfo"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CBrokenLinkInfo"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
@@ -136,7 +136,7 @@ protected:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CExpression"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CExpression"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Expressions/FloatValue.h

@@ -47,7 +47,7 @@ protected:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CFloatValue"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CFloatValue"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Expressions/IdentifierExpr.h

@@ -50,7 +50,7 @@ public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CIdentifierExpr"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CIdentifierExpr"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Expressions/IfExpr.h

@@ -48,7 +48,7 @@ public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CIfExpr"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CIfExpr"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Expressions/InputParser.h

@@ -106,7 +106,7 @@ private:
 	
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CParser"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CParser"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Expressions/IntValue.h

@@ -62,7 +62,7 @@ private:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CIntValue"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CIntValue"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Expressions/KX_HashedPtr.h

@@ -52,7 +52,7 @@ public:
 	
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CHashedPtr"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CHashedPtr"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Expressions/Operator1Expr.h

@@ -50,7 +50,7 @@ private:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:COperator1Expr"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:COperator1Expr"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Expressions/Operator2Expr.h

@@ -56,7 +56,7 @@ private:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:COperator2Expr"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:COperator2Expr"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Expressions/PyObjectPlus.h

@@ -135,8 +135,8 @@ typedef struct PyObjectPlus_Proxy {
 // leave above line empty (macro)!
 #ifdef WITH_CXX_GUARDEDALLOC
 #define Py_Header __Py_Header \
-  void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, Type.tp_name); } \
-  void operator delete( void *mem ) { MEM_freeN(mem); } \
+  void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, Type.tp_name); } \
+  void operator delete(void *mem) { MEM_freeN(mem); } \
 
 #else
 #define Py_Header __Py_Header
@@ -144,7 +144,7 @@ typedef struct PyObjectPlus_Proxy {
 
 #ifdef WITH_CXX_GUARDEDALLOC
 #define Py_HeaderPtr __Py_HeaderPtr \
-  void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, Type.tp_name); } \
+  void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, Type.tp_name); } \
   void operator delete( void *mem ) { MEM_freeN(mem); } \
 
 #else
@@ -466,16 +466,17 @@ typedef PyTypeObject * PyParentObject;				// Define the PyParent Object
 
 #define Py_Header \
  public: \
-
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:PyObjectPlus"); } \
+	void operator delete( void *mem ) { MEM_freeN(mem); } \
 
 #define Py_HeaderPtr \
  public: \
-
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:PyObjectPlusPtr"); } \
+	void operator delete( void *mem ) { MEM_freeN(mem); } \
 
 #endif
 
 
-
 // By making SG_QList the ultimate parent for PyObjectPlus objects, it
 // allows to put them in 2 different dynamic lists at the same time
 // The use of these links is interesting because they free of memory allocation

source/gameengine/Expressions/StringValue.h

@@ -52,7 +52,7 @@ private:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CStringValue"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CStringValue"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Expressions/Value.h

@@ -181,7 +181,7 @@ public:
 	
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CAction"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CAction"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
@@ -436,7 +436,7 @@ protected:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CPropValue"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CPropValue"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Expressions/VectorValue.h

@@ -83,7 +83,7 @@ protected:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CVectorValue"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CVectorValue"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Expressions/VoidValue.h

@@ -63,7 +63,7 @@ public:
 	
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:CVoidValue"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:CVoidValue"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/GameLogic/SCA_ActuatorEventManager.h

@@ -47,7 +47,7 @@ public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_ActuatorEventManager"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_ActuatorEventManager"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/GameLogic/SCA_AlwaysEventManager.h

@@ -41,7 +41,7 @@ public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_AlwaysEventManager"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_AlwaysEventManager"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/GameLogic/SCA_BasicEventManager.h

@@ -48,7 +48,7 @@ public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_BasicEventManager"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_BasicEventManager"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/GameLogic/SCA_EventManager.h

@@ -82,7 +82,7 @@ protected:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_EventManager"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_EventManager"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/GameLogic/SCA_ExpressionController.h

@@ -57,7 +57,7 @@ public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_ExpressionController"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_ExpressionController"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/GameLogic/SCA_IActuator.h

@@ -157,7 +157,7 @@ public:
 	
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_IActuator"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_IActuator"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/GameLogic/SCA_IInputDevice.h

@@ -316,8 +316,8 @@ public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_InputEvent"); }
-	void operator delete( void *mem ) { MEM_freeN(mem); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_InputEvent"); }
+	void operator delete(void *mem) { MEM_freeN(mem); }
 #endif
 };
 

source/gameengine/GameLogic/SCA_IScene.h

@@ -72,7 +72,7 @@ public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_IScene"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_IScene"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/GameLogic/SCA_JoystickManager.h

@@ -48,7 +48,7 @@ public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_JoystickManager"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_JoystickManager"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/GameLogic/SCA_KeyboardManager.h

@@ -58,7 +58,7 @@ public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_KeyboardManager"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_KeyboardManager"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/GameLogic/SCA_LogicManager.h

@@ -146,7 +146,7 @@ public:
 	
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_LogicManager"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_LogicManager"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/GameLogic/SCA_MouseManager.h

@@ -67,7 +67,7 @@ public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_MouseManager"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_MouseManager"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/GameLogic/SCA_PropertyEventManager.h

@@ -46,7 +46,7 @@ public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_PropertyEventManager"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_PropertyEventManager"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/GameLogic/SCA_RandomEventManager.h

@@ -47,7 +47,7 @@ public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_RandomEventManager"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_RandomEventManager"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/GameLogic/SCA_RandomNumberGenerator.h

@@ -77,7 +77,7 @@ class SCA_RandomNumberGenerator {
 	
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_RandomNumberGenerator"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_RandomNumberGenerator"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/GameLogic/SCA_TimeEventManager.h

@@ -52,7 +52,7 @@ public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_TimeEventManager"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:SCA_TimeEventManager"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Ketsji/BL_BlenderShader.h

@@ -61,7 +61,7 @@ public:
 	
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_BlenderShader"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_BlenderShader"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Ketsji/BL_Material.h

@@ -106,7 +106,7 @@ public:
 	
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_Material"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_Material"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Ketsji/BL_Shader.h

@@ -28,7 +28,7 @@ public:
 	
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_Sampler"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_Sampler"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
@@ -75,7 +75,7 @@ public:
 	
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_Uniform"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_Uniform"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
@@ -100,7 +100,7 @@ public:
 	
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_DefUniform"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_DefUniform"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Ketsji/BL_Texture.h

@@ -70,7 +70,7 @@ public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_Texture"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:BL_Texture"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Ketsji/KX_BulletPhysicsController.h

@@ -83,7 +83,7 @@ public:
 	
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BulletPhysicsController"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BulletPhysicsController"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Ketsji/KX_CameraIpoSGController.h

@@ -88,7 +88,7 @@ public:
 	
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_CameraIpoSGController"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_CameraIpoSGController"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Ketsji/KX_ClientObjectInfo.h

@@ -78,7 +78,7 @@ public:
 	
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_ClientObjectInfo"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_ClientObjectInfo"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Ketsji/KX_Dome.h

@@ -188,7 +188,7 @@ protected:
 	
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_Dome"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_Dome"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Ketsji/KX_EmptyObject.h

@@ -41,7 +41,7 @@ public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_EmptyObject"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_EmptyObject"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Ketsji/KX_IInterpolator.h

@@ -44,7 +44,7 @@ public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_IInterpolator"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_IInterpolator"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Ketsji/KX_IPO_SGController.h

@@ -119,7 +119,7 @@ public:
 	
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_IpoSGController"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_IpoSGController"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Ketsji/KX_IPhysicsController.h

@@ -130,7 +130,7 @@ public:
 	
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_IPhysicsController"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_IPhysicsController"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Ketsji/KX_IScalarInterpolator.h

@@ -42,7 +42,7 @@ public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_IScalarInterpolator"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_IScalarInterpolator"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Ketsji/KX_ISceneConverter.h

@@ -87,7 +87,7 @@ public:
 	
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_ISceneConverter"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_ISceneConverter"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Ketsji/KX_ISystem.h

@@ -55,7 +55,7 @@ public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_ISystem"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_ISystem"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Ketsji/KX_KetsjiEngine.h

@@ -412,7 +412,7 @@ protected:
 	
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_KetsjiEngine"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_KetsjiEngine"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Ketsji/KX_LightIpoSGController.h

@@ -96,7 +96,7 @@ public:
 	
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_LightIpoSGController"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_LightIpoSGController"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Ketsji/KX_MaterialIpoController.h

@@ -54,7 +54,7 @@ public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_MaterialIpoController"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_MaterialIpoController"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Ketsji/KX_MotionState.h

@@ -55,7 +55,7 @@ public:
 
 
 #ifdef WITH_CXX_GUARDEDALLOC
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_MotionState"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_MotionState"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Ketsji/KX_ObColorIpoSGController.h

@@ -71,7 +71,7 @@ public:
 	
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_ObColorIpoSGController"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_ObColorIpoSGController"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Ketsji/KX_OrientationInterpolator.h

@@ -54,7 +54,7 @@ private:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 private:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_OrientationInterpolator"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_OrientationInterpolator"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Ketsji/KX_PolygonMaterial.h

@@ -143,6 +143,7 @@ public:
 	static PyObject*	pyattr_get_specular(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef);	
 	static int			pyattr_set_specular(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef, PyObject *value);
 #endif
+
 };
 
 #endif // __KX_POLYGONMATERIAL_H__

source/gameengine/Ketsji/KX_PositionInterpolator.h

@@ -54,7 +54,7 @@ private:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 private:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_PositionInterpolator"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_PositionInterpolator"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Ketsji/KX_PythonInit.cpp

@@ -121,18 +121,21 @@ extern "C" {
 	#include "BLO_readfile.h"
 }
 
-
 #include "NG_NetworkScene.h" //Needed for sendMessage()
 
-static void setSandbox(TPythonSecurityLevel level);
-
 // 'local' copy of canvas ptr, for window height/width python scripts
+
+#ifndef DISABLE_PYTHON
+
 static RAS_ICanvas* gp_Canvas = NULL;
+static char gp_GamePythonPath[FILE_MAXDIR + FILE_MAXFILE] = "";
+static char gp_GamePythonPathOrig[FILE_MAXDIR + FILE_MAXFILE] = ""; // not super happy about this, but we need to remember the first loaded file for the global/dict load save
+
+#endif // DISABLE_PYTHON
+
 static KX_Scene*	gp_KetsjiScene = NULL;
 static KX_KetsjiEngine*	gp_KetsjiEngine = NULL;
 static RAS_IRasterizer* gp_Rasterizer = NULL;
-static char gp_GamePythonPath[FILE_MAXDIR + FILE_MAXFILE] = "";
-static char gp_GamePythonPathOrig[FILE_MAXDIR + FILE_MAXFILE] = ""; // not super happy about this, but we need to remember the first loaded file for the global/dict load save
 
 void KX_SetActiveScene(class KX_Scene* scene)
 {
@@ -1704,7 +1707,7 @@ static PyMethodDef meth_import[] = {{ "import", KXpy_import, METH_VARARGS, "our
 //static PyObject *g_oldimport = 0;
 //static int g_security = 0;
 
-void setSandbox(TPythonSecurityLevel level)
+static void setSandbox(TPythonSecurityLevel level)
 {
     PyObject *m = PyImport_AddModule("__builtin__");
     PyObject *d = PyModule_GetDict(m);

source/gameengine/Ketsji/KX_RayCast.h

@@ -95,7 +95,7 @@ public:
 	
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_RayCast"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_RayCast"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
@@ -134,7 +134,7 @@ public:
 	
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_RayCast::Callback"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_RayCast::Callback"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Ketsji/KX_RayEventManager.h

@@ -46,7 +46,7 @@ public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_RayEventManager"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_RayEventManager"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.h

@@ -103,7 +103,7 @@ private :
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BoneParentRelation"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_BoneParentRelation"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Ketsji/KX_SG_NodeRelationships.h

@@ -93,7 +93,7 @@ private :
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_NormalParentRelation"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_NormalParentRelation"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
@@ -150,7 +150,7 @@ private :
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_VertexParentRelation"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_VertexParentRelation"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };
@@ -233,7 +233,7 @@ private :
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_SlowParentRelation"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_SlowParentRelation"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Ketsji/KX_ScalarInterpolator.h

@@ -59,7 +59,7 @@ private:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_ScalarInterpolator"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_ScalarInterpolator"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Ketsji/KX_ScalingInterpolator.h

@@ -54,7 +54,7 @@ private:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_ScalingInterpolator"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_ScalingInterpolator"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Ketsji/KX_Scene.h

@@ -84,6 +84,10 @@ class btCollisionShape;
 class KX_BlenderSceneConverter;
 struct KX_ClientObjectInfo;
 
+#ifdef WITH_CXX_GUARDEDALLOC
+#include "MEM_guardedalloc.h"
+#endif
+
 /* for ID freeing */
 #define IS_TAGGED(_id) ((_id) && (((ID *)_id)->flag & LIB_DOIT))
 
@@ -610,8 +614,6 @@ public:
 	//void PrintStats(int verbose_level) {
 	//	m_bucketmanager->PrintStats(verbose_level)
 	//}
-
-
 };
 
 typedef std::vector<KX_Scene*> KX_SceneList;

source/gameengine/Ketsji/KX_TimeCategoryLogger.h

@@ -128,7 +128,7 @@ protected:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_TimeCategoryLogger"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_TimeCategoryLogger"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Ketsji/KX_TimeLogger.h

@@ -106,7 +106,7 @@ protected:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_TimeLogger"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_TimeLogger"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Ketsji/KX_TouchEventManager.h

@@ -79,7 +79,7 @@ public:
 	
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_TouchEventManager"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_TouchEventManager"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Ketsji/KX_WorldInfo.h

@@ -67,7 +67,7 @@ public:
 	
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_WorldInfo"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_WorldInfo"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Ketsji/KX_WorldIpoController.h

@@ -94,7 +94,7 @@ public:
 	
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_WorldIpoController"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:KX_WorldIpoController"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Network/NG_NetworkDeviceInterface.h

@@ -74,7 +74,7 @@ public:
 	
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:NG_NetworkDeviceInterface"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:NG_NetworkDeviceInterface"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Network/NG_NetworkMessage.h

@@ -130,7 +130,7 @@ public:
 	
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:NG_NetworkMessage"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:NG_NetworkMessage"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Network/NG_NetworkObject.h

@@ -47,7 +47,7 @@ public:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:NG_NetworkObject"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:NG_NetworkObject"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };

source/gameengine/Network/NG_NetworkScene.h

@@ -108,7 +108,7 @@ protected:
 
 #ifdef WITH_CXX_GUARDEDALLOC
 public:
-	void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:NG_NetworkScene"); }
+	void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:NG_NetworkScene"); }
 	void operator delete( void *mem ) { MEM_freeN(mem); }
 #endif
 };