27052 2009-07-07 18:45:42 -0700 Undef ASSERT, to avoid excessive warnings 2009-07-15 07:04:22 -0700 1 1 1 Unclassified WebKit JavaScriptCore 528+ (Nightly build) S60 Emulator S60 3rd edition RESOLVED FIXED P2 Normal --- 0 norbert.leser webkit-unassigned eric hausmann laszlo.gombos yongjun.zhang oldest_to_newest 130331 0 norbert.leser 2009-07-07 18:45:42 -0700 ASSERT will be defined in both conditional branches of the code following the proposed patch. The explicit undef avoids potential warning messages during compilation. 130332 1 32412 norbert.leser 2009-07-07 18:47:22 -0700 Created attachment 32412 Code patch for Assertion.h 2nd attempt to add attachment - failed first time 131084 2 eric 2009-07-10 23:13:37 -0700 I don't understand the reason for this patch? 131867 3 32780 laszlo.gombos 2009-07-15 06:05:58 -0700 Created attachment 32780 Second try. Changed the patch so that it only impacts the SYMBIAN platform and reflect the intention of this change better. In addition fixed the ChangeLog (filling in for Norbert.) The reason for this patch is to kill the following compiler warning: "\WebKit\JavaScriptCore\wtf\Assertions.h", line 146: Warning: #47-D: incompatible redefinition of macro "ASSERT" (declared at line 3029 of "\epoc32\include\e32def.h") #define ASSERT(assertion) ((void)0) 131868 4 laszlo.gombos 2009-07-15 06:09:48 -0700 (In reply to comment #3) > Created an attachment (id=32780) [details] > Second try. > > Changed the patch so that it only impacts the SYMBIAN platform and reflect the > intention of this change better. In addition fixed the ChangeLog (filling in > for Norbert.) > > The reason for this patch is to kill the following compiler warning: > > "\WebKit\JavaScriptCore\wtf\Assertions.h", line 146: Warning: #47-D: > incompatible redefinition of macro "ASSERT" (declared at line 3029 of > "\epoc32\include\e32def.h") > #define ASSERT(assertion) ((void)0) The second patch should obsolete the first patch from Norbert - I do not seems to have rights to make the first patch obsolete. 131875 5 32412 zecke 2009-07-15 06:56:25 -0700 Comment on attachment 32412 Code patch for Assertion.h Obsolete according to lazlos. 131876 6 32780 hausmann 2009-07-15 07:03:50 -0700 Comment on attachment 32780 Second try. r=me. I'll mention Symbian in the changelog when landing, to make it a bit clearer. 131877 7 hausmann 2009-07-15 07:04:22 -0700 Landed in r45907 32412 2009-07-07 18:47:22 -0700 2009-07-15 06:56:25 -0700 Code patch for Assertion.h patch_Assertions_h_1.txt text/plain 872 norbert.leser SW5kZXg6IENoYW5nZUxvZw0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIENoYW5nZUxvZwkocmV2aXNpb24gNDU2 MTApCisrKyBDaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxMSBAQAorMjAwOS0w Ny0wNyAgTm9yYmVydCBMZXNlciAgPG5vcmJlcnQubGVzZXJAbm9raWEuY29tPgorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVuZGVmIEFTU0VSVCwgdG8g YXZvaWQgZXhjZXNzaXZlIHdhcm5pbmdzCisKKyAgICAgICAgKiBKYXZhU2NyaXB0Q29yZS93dGYv QXNzZXJ0aW9ucy5oOgorCiAyMDA5LTA3LTAzICBKYW4gTWljaGFlbCBBbG9uem8gIDxqbWFsb256 b0B3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFhhbiBMb3BleiBhbmQgR3VzdGF2 byBOb3JvbmhhLgpJbmRleDogSmF2YVNjcmlwdENvcmUvd3RmL0Fzc2VydGlvbnMuaA0KPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQ0KLS0tIEphdmFTY3JpcHRDb3JlL3d0Zi9Bc3NlcnRpb25zLmgJKHJldmlzaW9uIDQ1NjEw KQorKysgSmF2YVNjcmlwdENvcmUvd3RmL0Fzc2VydGlvbnMuaAkod29ya2luZyBjb3B5KQpAQCAt MTQxLDYgKzE0MSwxMCBAQCB2b2lkIFdURkxvZ1ZlcmJvc2UoY29uc3QgY2hhciogZmlsZSwgaW50 CiAjdW5kZWYgQVNTRVJUCiAjZW5kaWYKIAorI2lmIGRlZmluZWQgQVNTRVJUCisjdW5kZWYgQVNT RVJUCisjZW5kaWYKKwogI2lmIEFTU0VSVF9ESVNBQkxFRAogCiAjZGVmaW5lIEFTU0VSVChhc3Nl cnRpb24pICgodm9pZCkwKQo= 32780 2009-07-15 06:05:58 -0700 2009-07-15 07:03:50 -0700 Second try. patch_27052.txt text/plain 1110 laszlo.gombos SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDQ1OTA2KQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTIgQEAKKzIwMDktMDctMTUgIE5vcmJlcnQg TGVzZXIgIDxub3JiZXJ0Lmxlc2VyQG5va2lhLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVbmRlZiBBU1NFUlQsIHRvIGF2b2lkIGV4Y2Vzc2l2 ZSB3YXJuaW5ncworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjcwNTIKKworICAgICAgICAqIHd0Zi9Bc3NlcnRpb25zLmg6CisKIDIwMDktMDctMTUgIE9s aXZlciBIdW50ICA8b2xpdmVyQGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBTaW1v biBIYXVzbWFubi4KSW5kZXg6IEphdmFTY3JpcHRDb3JlL3d0Zi9Bc3NlcnRpb25zLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gSmF2YVNjcmlwdENvcmUvd3RmL0Fzc2VydGlvbnMuaAkocmV2aXNpb24gNDU4NTYp CisrKyBKYXZhU2NyaXB0Q29yZS93dGYvQXNzZXJ0aW9ucy5oCSh3b3JraW5nIGNvcHkpCkBAIC0x MzYsOCArMTM2LDggQEAgdm9pZCBXVEZMb2dWZXJib3NlKGNvbnN0IGNoYXIqIGZpbGUsIGludAog I3VuZGVmIEVSUk9SCiAjZW5kaWYKIAotI2lmIFBMQVRGT1JNKFdJTl9PUykKLS8qIEZJWE1FOiBD aGFuZ2UgdG8gdXNlIHNvbWV0aGluZyBvdGhlciB0aGFuIEFTU0VSVCB0byBhdm9pZCB0aGlzIGNv bmZsaWN0IHdpdGggd2luMzIuICovCisjaWYgUExBVEZPUk0oV0lOX09TKSB8fCBQTEFURk9STShT WU1CSUFOKQorLyogRklYTUU6IENoYW5nZSB0byB1c2Ugc29tZXRoaW5nIG90aGVyIHRoYW4gQVNT RVJUIHRvIGF2b2lkIHRoaXMgY29uZmxpY3Qgd2l0aCB0aGUgdW5kZXJseWluZyBwbGF0Zm9ybSAq LwogI3VuZGVmIEFTU0VSVAogI2VuZGlmCiAK