Changeset 34660 in webkit for trunk/JavaScriptCore

Timestamp:

Jun 19, 2008, 11:03:23 AM (17 years ago)

Author:

[email protected]

Message:

Windows and Qt build fixes.

• kjs/collector.h:
• kjs/collector.cpp: (KJS::Heap::Heap): Wrapped m_pagesize in #if PLATFORM(UNIX), which should better match the sequence of #elifs in allocateBlock(). Changed MIN_ARRAY_SIZE to be explicitly size_t, as this type is different on different platforms.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/collector.cpp (modified) (3 diffs)
• kjs/collector.h (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-06-19  Alexey Proskuryakov  <[email protected]>
+
+        Windows and Qt build fixes.
+
+        * kjs/collector.h: 
+        * kjs/collector.cpp:
+        (KJS::Heap::Heap):
+        Wrapped m_pagesize in #if PLATFORM(UNIX), which should better match the sequence of #elifs
+        in allocateBlock(). Changed MIN_ARRAY_SIZE to be explicitly size_t, as this type is different
+        on different platforms.
+
 2008-06-17  Alexey Proskuryakov  <[email protected]>
 

trunk/JavaScriptCore/kjs/collector.cpp

@@ -86 +86 @@
 // This value has to be a macro to be used in max() without introducing
 // a PIC branch in Mach-O binaries, see <rdar://problem/5971391>.
-#define MIN_ARRAY_SIZE 14UL
+#define MIN_ARRAY_SIZE (static_cast<size_t>(14))
 
 Heap::Heap()
-    : m_pagesize(getpagesize())
-    , mainThreadOnlyObjectCount(0)
+    : mainThreadOnlyObjectCount(0)
     , m_markListSet(0)
+#if PLATFORM(UNIX)
+    , m_pagesize(getpagesize())
+#endif
 {
     memset(&primaryHeap, 0, sizeof(CollectorHeap));
@@ -477 +479 @@
 }
 
+#if PLATFORM(DARWIN)
 void Heap::initializeHeapIntrospector()
 {
@@ -482 +485 @@
     CollectorHeapIntrospector::init(&primaryHeap, &numberHeap);
 }
-
+#endif
 #endif
 

trunk/JavaScriptCore/kjs/collector.h

@@ -121 +121 @@
         typedef HashCountedSet<JSCell*> ProtectCountSet;
 
-        const size_t m_pagesize;
-
         size_t mainThreadOnlyObjectCount;
         CollectorHeap primaryHeap;
@@ -128 +126 @@
         ProtectCountSet protectedValues;
         HashSet<ArgList*>* m_markListSet;
+
+#if PLATFORM(UNIX)
+        const size_t m_pagesize;
+#endif
     };