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:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@13089 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/os-win32/stdint.h b/JavaScriptCore/os-win32/stdint.h
index 285b276..f55860c 100644
--- a/JavaScriptCore/os-win32/stdint.h
+++ b/JavaScriptCore/os-win32/stdint.h
@@ -4,7 +4,7 @@
/* This file emulates enough of unix's stdint.h on Windows
to make WebCore compile */
-#ifndef WIN32
+#if !PLATFORM(WIN_OS)
#error "This stdint.h file should only be compiled under Windows"
#endif
typedef unsigned short uint16_t;
