Bug 6497

Summary:

Use #include, not #import, in KWQ C++ files

Product:

WebKit

Reporter:

Justin Haygood <jhaygood>

Component:

WebKit Misc.

Assignee:

Darin Adler <darin>

Status:

RESOLVED FIXED

Severity:

Normal

Priority:

Version:

420+

Hardware:

OS:

Windows XP

Attachments:

Description	Flags
KWQ should use #include, not #import	darin: review+

Justin Haygood

Reported 2006-01-11 18:26:38 PST

Some KWQ C++ files use Objective C #import, which isn't portable to MSVC. #import for MSVC means import from a COM type library. Attatched patch changes this to use #include in KWQ files with a .cpp extension already and with the changes compile on Win32 readily.

Attachments
KWQ should use #include, not #import (4.69 KB, patch) 2006-01-11 18:26 PST, Justin Haygood	darin: review+	Details Formatted Diff Diff
View All Add attachment proposed patch, testcase, etc.

Justin Haygood

Comment 1 2006-01-11 18:26:54 PST

Created attachment 5611 [details] KWQ should use #include, not #import

Justin Haygood

Comment 2 2006-01-11 18:28:21 PST

Comment on attachment 5611 [details] KWQ should use #include, not #import the #import <JavaScriptCore/pcre.h> should was changed to make it so that Windows doesn't have to copy header files to someplace else. If someone doesn't like it, r- and i'll change back (and keep it #include <pcre/pcre.h> on my local copy ;))

Darin Adler

Comment 3 2006-01-11 18:37:58 PST

Comment on attachment 5611 [details] KWQ should use #include, not #import looks fine, r=me

Darin Adler

Comment 4 2006-01-12 07:30:40 PST

As far as the JavaScriptCore is concerned, it's not about "not liking it". It's about continuing to compile on Mac OS X. I think the right include for that is simply #include <pcre.h>; we can use forwarding headers on Mac OS X and include paths on Windows.

Darin Adler

Comment 5 2006-01-12 07:37:44 PST

Nah, #include <pcre/pcre.h> is fine.

Note You need to log in before you can comment on or make changes to this bug.