[Scummvm-cvs-logs] CVS: scummvm/base main.cpp,1.27,1.28

Max Horn fingolfin at users.sourceforge.net
Sun Dec 21 11:25:03 CET 2003


Update of /cvsroot/scummvm/scummvm/base
In directory sc8-pr-cvs1:/tmp/cvs-serv28222/base

Modified Files:
	main.cpp 
Log Message:
disable custom new/delete/free by default (only keep it around in case it comes in handy again in the future)

Index: main.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/main.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- main.cpp	8 Dec 2003 16:14:00 -0000	1.27
+++ main.cpp	21 Dec 2003 19:24:14 -0000	1.28
@@ -310,7 +310,8 @@
 
 #endif // WIN32_WCE
 
-#if !defined(__PALM_OS__) && !defined(MACOSX) && !defined(_WIN32_WCE)
+/*
+#if !defined(__PALM_OS__) && !defined(_WIN32_WCE)
 void *operator new(size_t size) {
 	return memset(malloc(size), 0xE7, size);
 }
@@ -331,3 +332,4 @@
 	free(ptr);
 }
 #endif
+*/





More information about the Scummvm-git-logs mailing list