[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
eric at webkit.org
eric at webkit.org
Thu Apr 8 01:38:34 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 7a2273a8472cfbaa109d38a3cb8dc72278a51b3a
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Feb 4 02:49:29 2010 +0000
2010-02-03 Kwang Yul Seo <skyul at company100.net>
Reviewed by Eric Seidel.
[BREWMP] Define WTF_PLATFORM_BREWMP_SIMULATOR when AEE_SIMULATOR is defined
https://bugs.webkit.org/show_bug.cgi?id=34514
PLATFORM(BREWMP_SIMULATOR) guard is needed to make distinction between BREWMP
and BREWMP simulator.
* wtf/Platform.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54320 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 047516e..d5fb90c 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -2,6 +2,18 @@
Reviewed by Eric Seidel.
+ [BREWMP] Define WTF_PLATFORM_BREWMP_SIMULATOR when AEE_SIMULATOR is defined
+ https://bugs.webkit.org/show_bug.cgi?id=34514
+
+ PLATFORM(BREWMP_SIMULATOR) guard is needed to make distinction between BREWMP
+ and BREWMP simulator.
+
+ * wtf/Platform.h:
+
+2010-02-03 Kwang Yul Seo <skyul at company100.net>
+
+ Reviewed by Eric Seidel.
+
[BREWMP] Remove COMPILE_ASSERT conflict with the underlying PLATFORM
https://bugs.webkit.org/show_bug.cgi?id=34190
diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h
index 390854b..fc30af5 100644
--- a/JavaScriptCore/wtf/Platform.h
+++ b/JavaScriptCore/wtf/Platform.h
@@ -417,6 +417,11 @@
#define WTF_PLATFORM_HAIKU 1
#elif defined(BUILDING_BREWMP__)
#define WTF_PLATFORM_BREWMP 1
+#if defined(AEE_SIMULATOR)
+#define WTF_PLATFORM_BREWMP_SIMULATOR 1
+#else
+#define WTF_PLATFORM_BREWMP_SIMULATOR 0
+#endif
#elif OS(DARWIN)
#define WTF_PLATFORM_MAC 1
#elif OS(WINDOWS)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list