6497 2006-01-11 18:26:38 -0800 Use #include, not #import, in KWQ C++ files 2006-01-12 07:45:54 -0800 1 1 1 Unclassified WebKit WebKit Misc. 420+ PC Windows XP RESOLVED FIXED P2 Normal --- 1 jhaygood darin oldest_to_newest 28267 0 jhaygood 2006-01-11 18:26:38 -0800 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. 28268 1 5611 jhaygood 2006-01-11 18:26:54 -0800 Created attachment 5611 KWQ should use #include, not #import 28269 2 5611 jhaygood 2006-01-11 18:28:21 -0800 Comment on attachment 5611 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 ;)) 28271 3 5611 darin 2006-01-11 18:37:58 -0800 Comment on attachment 5611 KWQ should use #include, not #import looks fine, r=me 28293 4 darin 2006-01-12 07:30:40 -0800 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. 28294 5 darin 2006-01-12 07:37:44 -0800 Nah, #include <pcre/pcre.h> is fine. 5611 2006-01-11 18:26:54 -0800 2006-01-11 18:37:58 -0800 KWQ should use #include, not #import win32-kwq-misc.patch text/plain 4804 jhaygood SW5kZXg6IEtXUUFycmF5SW1wbC5jcHANCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBLV1FBcnJheUltcGwuY3Bw CShyZXZpc2lvbiAxMjAwNCkNCisrKyBLV1FBcnJheUltcGwuY3BwCSh3b3JraW5nIGNvcHkpDQpA QCAtMjQsMTAgKzI0LDEwIEBADQogICovCiAKICNpbmNsdWRlICJjb25maWcuaCIKLSNpbXBvcnQg IktXUUFycmF5SW1wbC5oIgorI2luY2x1ZGUgIktXUUFycmF5SW1wbC5oIgogCi0jaW1wb3J0IDxu ZXc+Ci0jaW1wb3J0IDxzdHJpbmcuaD4KKyNpbmNsdWRlIDxuZXc+CisjaW5jbHVkZSA8c3RyaW5n Lmg+CiAKICNkZWZpbmUJTUlOKGEsYikgKCgoYSk8KGIpKT8oYSk6KGIpKQogCkluZGV4OiBLV1FC dWZmZXIuY3BwDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09DQotLS0gS1dRQnVmZmVyLmNwcAkocmV2aXNpb24gMTIwMDQp DQorKysgS1dRQnVmZmVyLmNwcAkod29ya2luZyBjb3B5KQ0KQEAgLTI0LDcgKzI0LDcgQEANCiAg Ki8KIAogI2luY2x1ZGUgImNvbmZpZy5oIgotI2ltcG9ydCAiS1dRQnVmZmVyLmgiCisjaW5jbHVk ZSAiS1dRQnVmZmVyLmgiCiAKIHZvaWQgUUJ1ZmZlcjo6b3BlbihpbnQpCiB7CkluZGV4OiBLV1FD U3RyaW5nLmNwcA0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIEtXUUNTdHJpbmcuY3BwCShyZXZpc2lvbiAxMjAw NCkNCisrKyBLV1FDU3RyaW5nLmNwcAkod29ya2luZyBjb3B5KQ0KQEAgLTI0LDEwICsyNCwxMCBA QA0KICAqLwogCiAjaW5jbHVkZSAiY29uZmlnLmgiCi0jaW1wb3J0ICJLV1FDU3RyaW5nLmgiCisj aW5jbHVkZSAiS1dRQ1N0cmluZy5oIgogCi0jaW1wb3J0IDxreG1sY29yZS9Bc3NlcnRpb25zLmg+ Ci0jaW1wb3J0IDxjdHlwZS5oPgorI2luY2x1ZGUgPGt4bWxjb3JlL0Fzc2VydGlvbnMuaD4KKyNp bmNsdWRlIDxjdHlwZS5oPgogCiB1c2luZyBzdGQ6Om9zdHJlYW07CiAKSW5kZXg6IEtXUUd1YXJk ZWRQdHIuY3BwDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09DQotLS0gS1dRR3VhcmRlZFB0ci5jcHAJKHJldmlzaW9uIDEy MDA0KQ0KKysrIEtXUUd1YXJkZWRQdHIuY3BwCSh3b3JraW5nIGNvcHkpDQpAQCAtMjQsOSArMjQs OSBAQA0KICAqLwogCiAjaW5jbHVkZSAiY29uZmlnLmgiCi0jaW1wb3J0ICJLV1FHdWFyZGVkUHRy LmgiCisjaW5jbHVkZSAiS1dRR3VhcmRlZFB0ci5oIgogCi0jaW1wb3J0ICJLV1FPYmplY3QuaCIK KyNpbmNsdWRlICJLV1FPYmplY3QuaCIKIAogS1dRR3VhcmRlZFB0ckJhc2U6OktXUUd1YXJkZWRQ dHJCYXNlKFFPYmplY3QgKm8pCiB7CkluZGV4OiBLV1FLSFRNTEZhY3RvcnkuY3BwDQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09DQotLS0gS1dRS0hUTUxGYWN0b3J5LmNwcAkocmV2aXNpb24gMTIwMDQpDQorKysgS1dRS0hU TUxGYWN0b3J5LmNwcAkod29ya2luZyBjb3B5KQ0KQEAgLTI0LDkgKzI0LDkgQEANCiAgKi8KIAog I2luY2x1ZGUgImNvbmZpZy5oIgotI2ltcG9ydCAiS1dRS0hUTUxGYWN0b3J5LmgiCisjaW5jbHVk ZSAiS1dRS0hUTUxGYWN0b3J5LmgiCiAKLSNpbXBvcnQgIktXUUtIVE1MU2V0dGluZ3MuaCIKKyNp bmNsdWRlICJLV1FLSFRNTFNldHRpbmdzLmgiCiAKIEtIVE1MU2V0dGluZ3MgKktIVE1MRmFjdG9y eTo6ZGVmYXVsdEhUTUxTZXR0aW5ncygpCiB7CkluZGV4OiBLV1FLUGFydHNFdmVudC5jcHANCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0NCi0tLSBLV1FLUGFydHNFdmVudC5jcHAJKHJldmlzaW9uIDEyMDA0KQ0KKysrIEtX UUtQYXJ0c0V2ZW50LmNwcAkod29ya2luZyBjb3B5KQ0KQEAgLTI0LDcgKzI0LDcgQEANCiAgKi8K IAogI2luY2x1ZGUgImNvbmZpZy5oIgotI2ltcG9ydCAiS1dRS1BhcnRzRXZlbnQuaCIKKyNpbmNs dWRlICJLV1FLUGFydHNFdmVudC5oIgogCiBuYW1lc3BhY2UgS1BhcnRzIHsKIApJbmRleDogS1dR TWFwSW1wbC5jcHANCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBLV1FNYXBJbXBsLmNwcAkocmV2aXNpb24gMTIw MDQpDQorKysgS1dRTWFwSW1wbC5jcHAJKHdvcmtpbmcgY29weSkNCkBAIC0yNCw4ICsyNCw4IEBA DQogICovCiAKICNpbmNsdWRlICJjb25maWcuaCIKLSNpbXBvcnQgIktXUU1hcEltcGwuaCIKLSNp bXBvcnQgIm1pc2Mvc2hhcmVkLmgiCisjaW5jbHVkZSAiS1dRTWFwSW1wbC5oIgorI2luY2x1ZGUg Im1pc2Mvc2hhcmVkLmgiCiAKIEtXUU1hcE5vZGVJbXBsOjpLV1FNYXBOb2RlSW1wbCgpIDoKICAg ICBwcmV2KE5VTEwpLApJbmRleDogS1dRUmVnRXhwLmNwcA0KPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIEtXUVJl Z0V4cC5jcHAJKHJldmlzaW9uIDEyMDA0KQ0KKysrIEtXUVJlZ0V4cC5jcHAJKHdvcmtpbmcgY29w eSkNCkBAIC0yNCwxMiArMjQsMTIgQEANCiAgKi8KIAogI2luY2x1ZGUgImNvbmZpZy5oIgotI2lt cG9ydCAiS1dRUmVnRXhwLmgiCi0jaW1wb3J0ICJLV1FMb2dnaW5nLmgiCisjaW5jbHVkZSAiS1dR UmVnRXhwLmgiCisjaW5jbHVkZSAiS1dRTG9nZ2luZy5oIgogCi0jaW1wb3J0IDxzeXMvdHlwZXMu aD4KLSNpbXBvcnQgPEphdmFTY3JpcHRDb3JlL3BjcmUuaD4KLSNpbXBvcnQgIm1pc2Mvc2hhcmVk LmgiCisjaW5jbHVkZSA8c3lzL3R5cGVzLmg+CisjaW5jbHVkZSA8cGNyZS9wY3JlLmg+CisjaW5j bHVkZSAibWlzYy9zaGFyZWQuaCIKIAogI2RlZmluZSBNQVhfU1VCU1RSSU5HUyAgMTAKICNkZWZp bmUgTUFYX09GRlNFVFMgICAgICgzICpNQVhfU1VCU1RSSU5HUykKSW5kZXg6IEtXUVN0eWxlLmNw cA0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQ0KLS0tIEtXUVN0eWxlLmNwcAkocmV2aXNpb24gMTIwMDQpDQorKysgS1dR U3R5bGUuY3BwCSh3b3JraW5nIGNvcHkpDQpAQCAtMjQsOSArMjQsOSBAQA0KICAqLwogCiAjaW5j bHVkZSAiY29uZmlnLmgiCi0jaW1wb3J0ICJLV1FTdHlsZS5oIgorI2luY2x1ZGUgIktXUVN0eWxl LmgiCiAKLSNpbXBvcnQgIktXUVdpZGdldC5oIgorI2luY2x1ZGUgIktXUVdpZGdldC5oIgogCiBR U2l6ZSBRU3R5bGU6OnNpemVGcm9tQ29udGVudHMoQ29udGVudFR5cGUsIFFXaWRnZXQgKiwgY29u c3QgUVNpemUgJnMpIGNvbnN0CiB7CkluZGV4OiBLV1FWYWx1ZUxpc3RJbXBsLmNwcA0KPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQ0KLS0tIEtXUVZhbHVlTGlzdEltcGwuY3BwCShyZXZpc2lvbiAxMjAwNCkNCisrKyBLV1FW YWx1ZUxpc3RJbXBsLmNwcAkod29ya2luZyBjb3B5KQ0KQEAgLTI0LDEwICsyNCwxMCBAQA0KICAq LwogCiAjaW5jbHVkZSAiY29uZmlnLmgiCi0jaW1wb3J0ICJLV1FWYWx1ZUxpc3RJbXBsLmgiCi0j aW1wb3J0ICJtaXNjL3NoYXJlZC5oIgorI2luY2x1ZGUgIktXUVZhbHVlTGlzdEltcGwuaCIKKyNp bmNsdWRlICJtaXNjL3NoYXJlZC5oIgogCi0jaW1wb3J0IDxzdGRsaWIuaD4KKyNpbmNsdWRlIDxz dGRsaWIuaD4KIAogY2xhc3MgS1dRVmFsdWVMaXN0SW1wbDo6S1dRVmFsdWVMaXN0UHJpdmF0ZSA6 IHB1YmxpYyBraHRtbDo6U2hhcmVkPEtXUVZhbHVlTGlzdEltcGw6OktXUVZhbHVlTGlzdFByaXZh dGU+CiB7CkluZGV4OiBLV1FWYXJpYW50LmNwcA0KPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIEtXUVZhcmlhbnQu Y3BwCShyZXZpc2lvbiAxMjAwNCkNCisrKyBLV1FWYXJpYW50LmNwcAkod29ya2luZyBjb3B5KQ0K QEAgLTI0LDkgKzI0LDkgQEANCiAgKi8KIAogI2luY2x1ZGUgImNvbmZpZy5oIgotI2ltcG9ydCAi S1dRVmFyaWFudC5oIgotI2ltcG9ydCAiS1dRU3RyaW5nLmgiCi0jaW1wb3J0ICJtaXNjL3NoYXJl ZC5oIgorI2luY2x1ZGUgIktXUVZhcmlhbnQuaCIKKyNpbmNsdWRlICJLV1FTdHJpbmcuaCIKKyNp bmNsdWRlICJtaXNjL3NoYXJlZC5oIgogCiBjbGFzcyBRVmFyaWFudDo6UVZhcmlhbnRQcml2YXRl IDogcHVibGljIGtodG1sOjpTaGFyZWQ8UVZhcmlhbnQ6OlFWYXJpYW50UHJpdmF0ZT4KIHsKSW5k ZXg6IEtXUVZlY3RvckltcGwuY3BwDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gS1dRVmVjdG9ySW1wbC5jcHAJ KHJldmlzaW9uIDEyMDA0KQ0KKysrIEtXUVZlY3RvckltcGwuY3BwCSh3b3JraW5nIGNvcHkpDQpA QCAtMjQsOCArMjQsMTAgQEANCiAgKi8KIAogI2luY2x1ZGUgImNvbmZpZy5oIgotI2ltcG9ydCAi S1dRVmVjdG9ySW1wbC5oIgorI2luY2x1ZGUgIktXUVZlY3RvckltcGwuaCIKIAorI2luY2x1ZGUg PHN0cmluZy5oPgorCiBLV1FWZWN0b3JJbXBsOjpLV1FWZWN0b3JJbXBsKHZvaWQgKCpmKSh2b2lk ICopKQogICAgIDogbV9kYXRhKDApLCBtX3NpemUoMCksIG1fY291bnQoMCksIG1fZGVsZXRlSXRl bUZ1bmN0aW9uKGYpCiB7Cg==