Bug 117360 - Compile WebCoreTestShimLibrary.cpp on iOS, but exclude the Carbon bits
Summary: Compile WebCoreTestShimLibrary.cpp on iOS, but exclude the Carbon bits
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: New Bugs (show other bugs)
Version: 528+ (Nightly build)
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Andy Estes
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-06-07 13:14 PDT by Andy Estes
Modified: 2013-06-07 13:33 PDT (History)
1 user (show)

See Also:

Attachments
Patch (2.74 KB, patch)
2013-06-07 13:24 PDT, Andy Estes 		mrowe: review+
Details | Formatted Diff | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Andy Estes 2013-06-07 13:14:38 PDT 
Compile WebCoreTestShimLibrary.cpp on iOS, but exclude the Carbon bits
Comment 1 Andy Estes 2013-06-07 13:24:04 PDT 
Created attachment 204063 [details]
Patch
Comment 2 David Kilzer (:ddkilzer) 2013-06-07 13:29:16 PDT 
Comment on attachment 204063 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=204063&action=review

r=me

> Source/WebCore/testing/WebCoreTestShimLibrary.cpp:28
> +#if !defined(TARGET_OS_IPHONE) || !TARGET_OS_IPHONE

We can't use #include <wtf/Platform.h> and #if !PLATFORM(IOS) here?
Comment 3 Andy Estes 2013-06-07 13:31:42 PDT 
(In reply to comment #2)
> (From update of attachment 204063 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=204063&action=review
> 
> r=me
> 
> > Source/WebCore/testing/WebCoreTestShimLibrary.cpp:28
> > +#if !defined(TARGET_OS_IPHONE) || !TARGET_OS_IPHONE
> 
> We can't use #include <wtf/Platform.h> and #if !PLATFORM(IOS) here?

We could, but we'd have to add WTF/JavaScriptCore to the target's header search path. It seemed easier to just use TargetConditionals.h.
Comment 4 Andy Estes 2013-06-07 13:33:32 PDT 
Committed r151334: <http://trac.webkit.org/changeset/151334>