29535 2009-09-21 00:18:59 -0700 [Qt] Buildfix on Windows building with MSVC 2009-09-21 08:50:20 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) PC Windows XP RESOLVED FIXED Qt P2 Blocker --- 0 ossy webkit-unassigned zoltan oldest_to_newest 148604 0 ossy 2009-09-21 00:18:59 -0700 The error message: ..\..\..\JavaScriptCore\wtf/Vector.h(276) : warning C4003: not enough actual parameters for macro 'max' t:\webkit_git\javascriptcore\wtf\HashTraits.h(72) : warning C4003: not enough actual parameters for macro 'max' t:\webkit_git\javascriptcore\wtf\HashTraits.h(73) : warning C4003: not enough actual parameters for macro 'max' t:\webkit_git\javascriptcore\wtf\HashTraits.h(74) : warning C4003: not enough actual parameters for macro 'max' ..\..\..\JavaScriptCore\runtime/UString.h(93) : warning C4003: not enough actual parameters for macro 'max' ..\..\..\JavaScriptCore\runtime/UString.h(93) : error C2589: '(' : illegal token on right side of '::' ..\..\..\JavaScriptCore\runtime/UString.h(93) : error C2059: syntax error : '::' ..\..\..\JavaScriptCore\runtime/UString.h(93) : error C2143: syntax error : missing ';' before '{' ..\..\..\JavaScriptCore\jit\ExecutableAllocator.h(60) : warning C4003: not enough actual parameters for macro 'max' ..\..\..\JavaScriptCore\jit\ExecutableAllocator.h(60) : error C2589: '(' : illegal token on right side of '::' ..\..\..\JavaScriptCore\jit\ExecutableAllocator.h(60) : error C2059: syntax error : '::' ..\..\..\JavaScriptCore\jit\ExecutableAllocator.h(61) : error C2143: syntax error : missing ';' before '{' QNetworkReplyHandler.cpp Build error caused by define max(a,b) in a standard windows header (WinDef.h). Here max function must be used instead of max macro, accordingly max macro shouldn't be defined here. ( std::numeric_limits<T>::max() , ... ) 148605 1 39841 ossy 2009-09-21 00:20:51 -0700 Created attachment 39841 proposed patch 148658 2 39851 ossy 2009-09-21 07:54:52 -0700 Created attachment 39851 proposed patch Simon Hausmann pointed to missing include config.h . I tried it, and works correctly. Here is the simpler patch. 148694 3 zoltan 2009-09-21 08:50:20 -0700 Landed in http://trac.webkit.org/changeset/48583 39841 2009-09-21 00:20:51 -0700 2009-09-21 07:54:52 -0700 proposed patch winbuildfix111.patch text/plain 924 ossy ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NTIxMzVlMS4uZWU1ZTNmNCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAwOS0wOS0yMSAgQ3NhYmEgT3N6dHJv Z29uYWMgIDxvc3ppQGluZi51LXN6ZWdlZC5odT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBbUXRdIFdpbmRvd3MgYnVpbGRmaXguCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yOTUzNQorCisgICAgICAgICog cGxhdGZvcm0vbmV0d29yay9xdC9EbnNQcmVmZXRjaEhlbHBlci5oOiBkZWZpbmUgTk9NSU5NQVgu CisKIDIwMDktMDktMjAgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAogICAgICAg ICBSZXZpZXdlZCBieSBNYWNpZWogU3RhY2hvd2lhay4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxh dGZvcm0vbmV0d29yay9xdC9EbnNQcmVmZXRjaEhlbHBlci5oIGIvV2ViQ29yZS9wbGF0Zm9ybS9u ZXR3b3JrL3F0L0Ruc1ByZWZldGNoSGVscGVyLmgKaW5kZXggZTg1ZDJkYy4uMDc1NTg2YyAxMDA2 NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3F0L0Ruc1ByZWZldGNoSGVscGVyLmgK KysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3F0L0Ruc1ByZWZldGNoSGVscGVyLmgKQEAg LTE5LDYgKzE5LDEwIEBACiAjaWZuZGVmIEROU1BSRUZFVENISEVMUEVSX0gKICNkZWZpbmUgRE5T UFJFRkVUQ0hIRUxQRVJfSAogCisjaWZuZGVmIE5PTUlOTUFYCisjZGVmaW5lIE5PTUlOTUFYCisj ZW5kaWYKKwogI2luY2x1ZGUgPFFPYmplY3Q+CiAjaW5jbHVkZSA8UUNhY2hlPgogI2luY2x1ZGUg PFFIb3N0SW5mbz4K 39851 2009-09-21 07:54:52 -0700 2009-09-21 07:54:52 -0700 proposed patch nominmax.patch text/plain 948 ossy ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg NDk1Njg0MC4uNzRmOWEyOCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAwOS0wOS0yMSAgQ3NhYmEgT3N6dHJv Z29uYWMgIDxvc3ppQGluZi51LXN6ZWdlZC5odT4KKworICAgICAgICBSdWJiZXItc3RhbXBlZCBi eSBTaW1vbiBIYXVzbWFubi4KKworICAgICAgICBbUXRdIFdpbmRvd3MgYnVpbGRmaXguCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yOTUzNQorCisgICAg ICAgICogcGxhdGZvcm0vbmV0d29yay9xdC9EbnNQcmVmZXRjaEhlbHBlci5jcHA6IE1pc3Npbmcg I2luY2x1ZGUgImNvbmZpZy5oIiAgYWRkZWQuCisKIDIwMDktMDktMjEgIEd1c3Rhdm8gTm9yb25o YSBTaWx2YSAgPGd1c3Rhdm8ubm9yb25oYUBjb2xsYWJvcmEuY28udWs+CiAKICAgICAgICAgVW5y ZXZpZXdlZCBtYWtlIGRpc3QgYnVpbGQgZml4LiBNaXNzaW5nIGZpbGVzLgpkaWZmIC0tZ2l0IGEv V2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3F0L0Ruc1ByZWZldGNoSGVscGVyLmNwcCBiL1dlYkNv cmUvcGxhdGZvcm0vbmV0d29yay9xdC9EbnNQcmVmZXRjaEhlbHBlci5jcHAKaW5kZXggNzNkYTBh OS4uZTY4Nzk3NiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3F0L0Ruc1By ZWZldGNoSGVscGVyLmNwcAorKysgYi9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvcXQvRG5zUHJl ZmV0Y2hIZWxwZXIuY3BwCkBAIC0xNyw2ICsxNyw3IEBACiAgICAgQm9zdG9uLCBNQSAwMjExMC0x MzAxLCBVU0EuCiAqLwogCisjaW5jbHVkZSAiY29uZmlnLmgiCiAjaW5jbHVkZSAiRG5zUHJlZmV0 Y2hIZWxwZXIuaCIKIAogI2luY2x1ZGUgIkNTdHJpbmcuaCIK