Bug 54168 – Move WTF_USE_CFNETWORK to Platform.h

• Status: RESOLVED
• Resolution: FIXED
• Component: WebCore Misc.

[Pratik Solanki]

WTF_USE_CFNETWORK is defined in WebCore/config.h. It should be defined in Platform.h which will make it easier to have #if USE(CFNETWORK) blocks in WebKit.

[Pratik Solanki]

Created attachment 81925 [details]
Patch

Patch attached. Though I will wait for the Windows EWS to build it before checking it in.

[David Kilzer (:ddkilzer)]

Comment on attachment 81925 [details]
Patch

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

r=me with the fix to provide a default for WTF_USE_CFNETWORK.

> Source/JavaScriptCore/wtf/Platform.h:684
> +#define WTF_USE_CFNETWORK 1

You need to add a section closer to the end of Platform.h that provides a default:

#if !defined(WTF_USE_CFNETWORK)
#define WTF_USE_CFNETWORK 0
#endif

You might want to move it close to this line just for proximity's sake:

/* Set up a define for a common error that is intended to cause a build error -- thus the space after Error. */
#define WTF_PLATFORM_CFNETWORK Error USE_macro_should_be_used_with_CFNETWORK

[Pratik Solanki]

Created attachment 82520 [details]
Patch

[Darin Adler]

Comment on attachment 81925 [details]
Patch

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

>> Source/JavaScriptCore/wtf/Platform.h:684
>> +#define WTF_USE_CFNETWORK 1
> 
> You need to add a section closer to the end of Platform.h that provides a default:
> 
> #if !defined(WTF_USE_CFNETWORK)
> #define WTF_USE_CFNETWORK 0
> #endif
> 
> You might want to move it close to this line just for proximity's sake:
> 
> /* Set up a define for a common error that is intended to cause a build error -- thus the space after Error. */
> #define WTF_PLATFORM_CFNETWORK Error USE_macro_should_be_used_with_CFNETWORK

I don’t think that’s right about needing a default. The USE macro checks for a symbol that’s not defined, so why would we need to define it as 0?

[Darin Adler]

Comment on attachment 82520 [details]
Patch

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

> Source/JavaScriptCore/wtf/Platform.h:1136
> +#if !defined(WTF_USE_CFNETWORK)
> +#define WTF_USE_CFNETWORK 0
> +#endif

I know Dave Kilzer told you this is needed, but I don’t think it is.

[David Kilzer (:ddkilzer)]

(In reply to comment #5)
> (From update of attachment 82520 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=82520&action=review
> 
> > Source/JavaScriptCore/wtf/Platform.h:1136
> > +#if !defined(WTF_USE_CFNETWORK)
> > +#define WTF_USE_CFNETWORK 0
> > +#endif
> 
> I know Dave Kilzer told you this is needed, but I don’t think it is.

I see, we only need this when the default is to enable.  Okay.

[Pratik Solanki]

Committed r78622: <http://trac.webkit.org/changeset/78622>