Changeset 13089 in webkit for trunk/JavaScriptCore/kxmlcore/TCSystemAlloc.cpp

Timestamp:

Mar 2, 2006, 1:12:06 AM (19 years ago)

Author:

mjs

Message:

JavaScriptCore:

Reviewed by Darin.

• Set up new prototype macros and avoid using #if without defined() in JSC

Added new PLATFORM macros and related, to make sure #if's all check if relevant macros
are defined, and to separate core OS-level dependencies from operating environment
dependencies so you can, e.g., build KDE on Mac or Windows.

• kxmlcore/Platform.h: Added.

• deploy them everywhere in JavaScriptCore

• JavaScriptCore.xcodeproj/project.pbxproj:
• bindings/jni/jni_utility.cpp: (KJS::Bindings::convertValueToJValue):
• bindings/objc/WebScriptObject.mm:
• bindings/objc/objc_instance.mm: (ObjcInstance::end):
• bindings/softlinking.h:
• bindings/testbindings.mm: (main):
• kjs/JSLock.cpp:
• kjs/collector.cpp: (KJS::Collector::markCurrentThreadConservatively): (KJS::Collector::markOtherThreadConservatively): (KJS::Collector::markStackObjectsConservatively):
• kjs/config.h:
• kjs/date_object.cpp: (gmtoffset): (KJS::formatTime): (KJS::DateProtoFunc::callAsFunction): (KJS::DateObjectImp::construct): (KJS::makeTime):
• kjs/dtoa.cpp:
• kjs/fpconst.cpp: (KJS::sizeof): (KJS::):
• kjs/grammar.y:
• kjs/identifier.cpp:
• kjs/internal.cpp:
• kjs/interpreter.cpp: (KJS::Interpreter::evaluate): (KJS::Interpreter::createLanguageInstanceForValue):
• kjs/interpreter.h:
• kjs/lookup.cpp:
• kjs/lookup.h:
• kjs/math_object.cpp:
• kjs/object.cpp:
• kjs/object.h:
• kjs/operations.cpp: (KJS::isNaN): (KJS::isInf): (KJS::isPosInf): (KJS::isNegInf):
• kjs/operations.h:
• kjs/regexp.cpp: (KJS::RegExp::RegExp): (KJS::RegExp::~RegExp): (KJS::RegExp::match):
• kjs/regexp.h:
• kjs/testkjs.cpp: (StopWatch::start): (StopWatch::stop): (StopWatch::getElapsedMS):
• kjs/ustring.cpp:
• kjs/ustring.h:
• kxmlcore/AlwaysInline.h:
• kxmlcore/Assertions.cpp:
• kxmlcore/Assertions.h:
• kxmlcore/FastMalloc.cpp: (KXMLCore::):
• kxmlcore/FastMalloc.h:
• kxmlcore/FastMallocInternal.h:
• kxmlcore/HashTable.h:
• kxmlcore/TCPageMap.h:
• kxmlcore/TCSpinLock.h: (TCMalloc_SpinLock::Lock): (TCMalloc_SpinLock::Unlock): (TCMalloc_SlowLock):
• kxmlcore/TCSystemAlloc.cpp: (TCMalloc_SystemAlloc):
• os-win32/stdint.h:

JavaScriptGlue:

Not reviewed, but I noticed these trivial extra changes were needed to avoid
breaking the build with my reviewed patch for:

​http://bugzilla.opendarwin.org/show_bug.cgi?id=7387

Add config.h, includes of it, and Platform.h forwarding header.

• JSBase.cpp:
• JSObject.cpp:
• JSRun.cpp:
• JSUtils.cpp:
• JSValueWrapper.cpp:
• JavaScriptGlue.cpp:
• UserObjectImp.cpp:
• config.h: Added.
• kxmlcore/Platform.h: Added.

WebCore:

Reviewed by Darin.

• WebCore updates for "Set up new prototype macros and avoid using #if without defined() in JSC" ​http://bugzilla.opendarwin.org/show_bug.cgi?id=7387

Add Platform.h

• ForwardingHeaders/kxmlcore/Platform.h: Added.
• bridge/mac/WebCoreFrameNamespaces.m:
• bridge/mac/WebCoreViewFactory.m:
• bridge/mac/WebDashboardRegion.m:
• config.h:
• platform/Logging.cpp:
• platform/mac/ScrollViewMac.mm: (WebCore::ScrollView::addChild):
• platform/mac/WebCoreCookieAdapter.m:
• platform/mac/WebCoreGraphicsBridge.m:
• platform/mac/WebCoreHistory.m:
• platform/mac/WebCoreImageRendererFactory.m:
• platform/mac/WebCoreKeyGenerator.m:
• platform/mac/WebCoreView.m:

File:

• trunk/JavaScriptCore/kxmlcore/TCSystemAlloc.cpp (modified) (6 diffs)

trunk/JavaScriptCore/kxmlcore/TCSystemAlloc.cpp

@@ -32 +32 @@
 
 #include "config.h"
-#if defined HAVE_STDINT_H
+#if HAVE(STDINT_H)
 #include <stdint.h>
-#elif defined HAVE_INTTYPES_H
+#elif HAVE(INTTYPES_H)
 #include <inttypes.h>
 #else
 #include <sys/types.h>
 #endif
-#ifndef WIN32
+#if !PLATFORM(WIN_OS)
 #include <unistd.h>
 #include <sys/mman.h>
@@ -92 +92 @@
 #endif
 
-#ifdef HAVE_SBRK
+#if HAVE(SBRK)
 
 static void* TrySbrk(size_t size, size_t alignment) {
@@ -128 +128 @@
 }
 
-#endif /* HAVE_SBRK */
-
-#ifdef HAVE_MMAP
+#endif /* HAVE(SBRK) */
+
+#if HAVE(MMAP)
 
 static void* TryMmap(size_t size, size_t alignment) {
@@ -171 +171 @@
 }
 
-#endif /* HAVE_MMAP */
+#endif /* HAVE(MMAP) */
 
 #ifndef KXC_CHANGES
@@ -269 +269 @@
 #endif
     
-#ifdef HAVE_SBRK
+#if HAVE(SBRK)
     if (use_sbrk && !sbrk_failure) {
       void* result = TrySbrk(size, alignment);
@@ -276 +276 @@
 #endif
 
-#ifdef HAVE_MMAP    
+#if HAVE(MMAP)    
     if (use_mmap && !mmap_failure) {
       void* result = TryMmap(size, alignment);