Changeset 23515 in webkit for trunk/JavaScriptCore/wtf/FastMalloc.h

Timestamp:

Jun 13, 2007, 7:23:29 PM (18 years ago)

Author:

lars

Message:

Disable FastMalloc for the Qt build and make sure we
don't reimplement the global new/delete operators
when using the system malloc.

File:

• trunk/JavaScriptCore/wtf/FastMalloc.h (modified) (1 diff)

trunk/JavaScriptCore/wtf/FastMalloc.h

@@ -62 +62 @@
 #ifndef _CRTDBG_MAP_ALLOC
 
+#if !(USE_SYSTEM_MALLOC)
 WTF_PRIVATE_INLINE void* operator new(size_t s) { return fastMalloc(s); }
 WTF_PRIVATE_INLINE void operator delete(void* p) { fastFree(p); }
 WTF_PRIVATE_INLINE void* operator new[](size_t s) { return fastMalloc(s); }
 WTF_PRIVATE_INLINE void operator delete[](void* p) { fastFree(p); }
+#endif
 
 #endif // _CRTDBG_MAP_ALLOC