BPLATFORM(IOS) always evaluates to false

https://bugs.webkit.org/show_bug.cgi?id=135843

Reviewed by Geoffrey Garen.

Fix typo in definition of BPLATFORM() and include system header TargetConditionals.h
(when building on an Apple platform) so that BPLATFORM(X) evaluates to true when
building for platform X. In particular, so that BPLATFORM(IOS) evaluates to true when
building for iOS.

As a side effect of this change, the change made in <http://trac.webkit.org/changeset/167289>
will be honored and iOS will assume a VM page size of 16kB (again) instead of 4kB.

* bmalloc/BPlatform.h:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@172510 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/bmalloc/ChangeLog b/Source/bmalloc/ChangeLog
index 70aa5917f8ed8de1b989a06aca9e2c4781404859..2291eea9f950bebfd74333ec36eb81a9dfc2b3a3 100644 (file)
--- a/Source/bmalloc/ChangeLog
+++ b/Source/bmalloc/ChangeLog
@@ -1,3 +1,20 @@
+2014-08-12  Daniel Bates  <dabates@apple.com>
+
+        BPLATFORM(IOS) always evaluates to false
+        https://bugs.webkit.org/show_bug.cgi?id=135843
+
+        Reviewed by Geoffrey Garen.
+
+        Fix typo in definition of BPLATFORM() and include system header TargetConditionals.h
+        (when building on an Apple platform) so that BPLATFORM(X) evaluates to true when
+        building for platform X. In particular, so that BPLATFORM(IOS) evaluates to true when
+        building for iOS.
+
+        As a side effect of this change, the change made in <http://trac.webkit.org/changeset/167289>
+        will be honored and iOS will assume a VM page size of 16kB (again) instead of 4kB.
+
+        * bmalloc/BPlatform.h:
+
 2014-08-11  Andy Estes  <aestes@apple.com>
 
         [iOS] Get rid of iOS.xcconfig

diff --git a/Source/bmalloc/bmalloc/BPlatform.h b/Source/bmalloc/bmalloc/BPlatform.h
index a6fe897c3513cfe0106665306849e564211d22ce..f3aae8ba106a3380701ec77a1b44ed8adb2ae12f 100644 (file)
--- a/Source/bmalloc/bmalloc/BPlatform.h
+++ b/Source/bmalloc/bmalloc/BPlatform.h
@@ -26,7 +26,11 @@
 #ifndef BPlatform_h
 #define BPlatform_h
 
-#define BPLATFORM(PLATFORM) (defined BPLATFORM_##PLATFORM && PLATFORM_##PLATFORM)
+#ifdef __APPLE__
+#include <TargetConditionals.h>
+#endif
+
+#define BPLATFORM(PLATFORM) (defined BPLATFORM_##PLATFORM && BPLATFORM_##PLATFORM)
 
 #if ((defined(TARGET_OS_EMBEDDED) && TARGET_OS_EMBEDDED) \
     || (defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE) \