Changeset 163291 in webkit for trunk/Source/JavaScriptCore/tools

Timestamp:

Feb 3, 2014, 12:17:33 AM (11 years ago)

Author:

[email protected]

Message:

Stop using PLATFORM(MAC) in JavaScriptCore except where it means “OS X but not iOS”
​https://bugs.webkit.org/show_bug.cgi?id=128098

Reviewed by Darin Adler.

• API/JSValueRef.cpp:

(JSValueUnprotect): Added an explicit !PLATFORM(IOS) in guards for the Evernote workaround,
which is only needed on OS X.

• API/tests/testapi.c:

(main): Changed PLATFORM(MAC)

PLATFORM(IOS) guards to OS(DARWIN), because they were

surrounding tests for code that is itself guarded by OS(DARWIN).

• runtime/Watchdog.h: Changed PLATFORM(MAC) to OS(DARWIN).

• tools/CodeProfiling.cpp:

(JSC::CodeProfiling::begin): Changed PLATFORM(MAC) to
OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK).
(JSC::CodeProfiling::end): Ditto.

File:

• trunk/Source/JavaScriptCore/tools/CodeProfiling.cpp (modified) (4 diffs)

trunk/Source/JavaScriptCore/tools/CodeProfiling.cpp

@@ -49 +49 @@
 #endif
 
-#if (PLATFORM(MAC) && CPU(X86_64)) || (OS(LINUX) && CPU(X86))
+#if (OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK) && CPU(X86_64)) || (OS(LINUX) && CPU(X86))
 // Helper function to start & stop the timer.
 // Presently we're using the wall-clock timer, since this seems to give the best results.
@@ -67 +67 @@
 #endif
 
-#if PLATFORM(MAC) && CPU(X86_64)
+#if OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK) && CPU(X86_64)
 static void profilingTimer(int, siginfo_t*, void* uap)
 {
@@ -144 +144 @@
         return;
 
-#if (PLATFORM(MAC) && CPU(X86_64)) || (OS(LINUX) && CPU(X86))
+#if (OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK) && CPU(X86_64)) || (OS(LINUX) && CPU(X86))
     // Regsiter a signal handler & itimer.
     struct sigaction action;
@@ -168 +168 @@
         return;
 
-#if (PLATFORM(MAC) && CPU(X86_64)) || (OS(LINUX) && CPU(X86))
+#if (OS(DARWIN) && !PLATFORM(EFL) && !PLATFORM(GTK) && CPU(X86_64)) || (OS(LINUX) && CPU(X86))
     // Stop profiling
     setProfileTimer(0);