Changeset 76716 in webkit

Timestamp:

Jan 26, 2011 1:59:22 PM (13 years ago)

Author:

yael.aharon@nokia.com

Message:

2011-01-26 Yael Aharon <​yael.aharon@nokia.com>

Reviewed by Laszlo Gombos.

[Qt][Symbian] Fix --minimal build
​https://bugs.webkit.org/show_bug.cgi?id=52839

Move definition of USE_SYSTEM_MALLOC out of pri file.
Put it in platform.h instead.

• Source/WebKit.pri:

2011-01-26 Yael Aharon <​yael.aharon@nokia.com>

Reviewed by Laszlo Gombos.

[Qt][Symbian] Fix --minimal build
​https://bugs.webkit.org/show_bug.cgi?id=52839

Move definition of USE_SYSTEM_MALLOC out of pri file.
Put it in platform.h instead.

• wtf/Platform.h:
• wtf/TCSystemAlloc.cpp:
• wtf/wtf.pri:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/wtf/Platform.h (modified) (1 diff)
• Source/JavaScriptCore/wtf/TCSystemAlloc.cpp (modified) (2 diffs)
• Source/JavaScriptCore/wtf/wtf.pri (modified) (2 diffs)
• Source/WebKit.pri (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2011-01-26  Yael Aharon  <yael.aharon@nokia.com>
+
+        Reviewed by Laszlo Gombos.
+
+        [Qt][Symbian] Fix --minimal build
+        https://bugs.webkit.org/show_bug.cgi?id=52839
+
+        Move definition of USE_SYSTEM_MALLOC out of pri file.
+        Put it in platform.h instead.
+
+        * Source/WebKit.pri:
+
 2011-01-26  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-01-26  Yael Aharon  <yael.aharon@nokia.com>
+
+        Reviewed by Laszlo Gombos.
+
+        [Qt][Symbian] Fix --minimal build
+        https://bugs.webkit.org/show_bug.cgi?id=52839
+
+        Move definition of USE_SYSTEM_MALLOC out of pri file.
+        Put it in platform.h instead.
+
+        * wtf/Platform.h:
+        * wtf/TCSystemAlloc.cpp:
+        * wtf/wtf.pri:
+
 2011-01-26  Patrick Gansterer  <paroga@webkit.org>
 

trunk/Source/JavaScriptCore/wtf/Platform.h

@@ -832 +832 @@
 /* We must not customize the global operator new and delete for the Qt port. */
 #define ENABLE_GLOBAL_FASTMALLOC_NEW 0
+#if !PLATFORM(UNIX) || OS(SYMBIAN)
+#define USE_SYSTEM_MALLOC 1
+#endif
 #endif
 

trunk/Source/JavaScriptCore/wtf/TCSystemAlloc.cpp

@@ -32 +32 @@
 
 #include "config.h"
+#if !(defined(USE_SYSTEM_MALLOC) && USE_SYSTEM_MALLOC)
 #include "TCSystemAlloc.h"
 
@@ -520 +521 @@
 
 #endif
+
+#endif // #if !(defined(USE_SYSTEM_MALLOC) && USE_SYSTEM_MALLOC)
+

trunk/Source/JavaScriptCore/wtf/wtf.pri

@@ -23 +23 @@
     wtf/RefCountedLeakCounter.cpp \
     wtf/StackBounds.cpp \
+    wtf/TCSystemAlloc.cpp \
     wtf/ThreadingNone.cpp \
     wtf/Threading.cpp \
@@ -43 +44 @@
 }
 
-!contains(DEFINES, USE_SYSTEM_MALLOC=1) {
-    SOURCES += wtf/TCSystemAlloc.cpp
-}
-
 unix:!symbian: SOURCES += wtf/OSAllocatorPosix.cpp
 symbian: SOURCES += wtf/OSAllocatorSymbian.cpp

trunk/Source/WebKit.pri

@@ -46 +46 @@
     }
     DEPENDPATH += $$PWD/WebKit/qt/Api
-}
-
-!mac:!unix|symbian {
-    DEFINES += USE_SYSTEM_MALLOC=1
 }