libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-18 16:03:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

disable custom new/delete/free by default (only keep it around in case it comes in handy again in the future)

Browse Source 
svn-id: r11839
This commit is contained in:
Max Horn 2003-12-21 19:24:14 +00:00
parent 9c9ee18ff8
commit 2e99e3f1f9
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
base/main.cpp
View File

@ -310,7 +310,8 @@ END_OF_MAIN();
#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 @@ void free_check(void *ptr) {
free(ptr);
}
#endif
*/

8
common/scummsys.h
View File

@ -426,10 +426,9 @@ FORCEINLINE uint16 SWAP_BYTES_16(uint16 a) {
typedef int16 NewGuiColor;
#endif
#if !defined(__PALM_OS__) && !defined(MACOSX)
/* Initialized operator new */
// FIXME - get rid of these new/delete overrides!!! They conflict with the
// Standard C++ library, and they are only there to support lazy programmers anyway.
/*
#if !defined(__PALM_OS__)
// Initialized operator new
void * operator new(size_t size);
void operator delete(void *ptr);
@ -442,5 +441,6 @@ FORCEINLINE uint16 SWAP_BYTES_16(uint16 a) {
void free_check(void *ptr);
#endif
#endif
*/
#endif