[Webkit-unassigned] [Bug 52839] [Qt][Symbian] Fix --minimal build

[bugzilla-daemon at webkit.org]

https://bugs.webkit.org/show_bug.cgi?id=52839


Laszlo Gombos <laszlo.1.gombos at nokia.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
  Attachment #80081|review?, commit-queue?      |review-
               Flag|                            |




--- Comment #16 from Laszlo Gombos <laszlo.1.gombos at nokia.com>  2011-01-25 13:29:03 PST ---
(From update of attachment 80081)
View in context: https://bugs.webkit.org/attachment.cgi?id=80081&action=review

r- to fix the Windows build.

> Source/JavaScriptCore/wtf/Platform.h:786
> +

This would only set USE_SYSTEM_MALLOC for the Symbian port and would break for example the Windows port of QtWebKit. I suggest we repeat the original rule from WebKit.pri. 

We already have a section for setting memory management related defaults for the Qt port, so perhaps we can add this rule there.

 #if PLATFORM(QT)
 /* 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

> Source/JavaScriptCore/wtf/TCSystemAlloc.cpp:34
> +#if !(defined(USE_SYSTEM_MALLOC) && USE_SYSTEM_MALLOC)

Can we just use !USE(SYSTEM_MALLOC) instead ?

> Source/JavaScriptCore/wtf/wtf.pri:45
> +SOURCES += wtf/TCSystemAlloc.cpp

I think we should move this entry together with the rest of the SOURCES list - alphabetically ordered.

-- 
Configure bugmail: https://bugs.webkit.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug.