21333 2008-10-03 07:24:55 -0700 Can't disable ENABLE_DASHBOARD or ENABLE_MAC_JAVA_BRIDGE on Mac 2023-12-01 04:41:32 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Mac OS X 10.5 RESOLVED FIXED P2 Normal --- 1 mark mark eric manzasiamrama2 pinkerton oldest_to_newest 93892 0 mark 2008-10-03 07:24:55 -0700 JavaScriptCore/wtf/Platform.h defines a bunch of ENABLE_* macros, which turn features on and off. Most of these #defines are wrapped in #if !defined blocks, which allows the Platform.h definitions to serve as defaults, but lets external definitions override them. In Chromium, we want to build with ENABLE_DASHBOARD=0, but this is not possible on the Mac because Platform.h does: #if PLATFORM(MAC) #define ENABLE_DASHBOARD 1 #endif This results in a macro redefinition and is not what we want. I propose wrapping the ENABLE_DASHBOARD and ENABLE_MAC_JAVA_BRIDGE macros in #if !defined blocks like all other ENABLE_ macros in Platform.h. 93893 1 24051 mark 2008-10-03 07:46:40 -0700 Created attachment 24051 Wrap #defines in #ifndef 94025 2 24051 timothy 2008-10-03 19:15:43 -0700 Comment on attachment 24051 Wrap #defines in #ifndef Change is fine but please add a description and bug url to the ChangeLog. 94251 3 24119 mark 2008-10-06 13:24:57 -0700 Created attachment 24119 Wrap #defines in #ifndef 94315 4 eric 2008-10-06 18:15:52 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M JavaScriptCore/ChangeLog M JavaScriptCore/wtf/Platform.h Committed r37363 24051 2008-10-03 07:46:40 -0700 2008-10-06 13:24:57 -0700 Wrap #defines in #ifndef webkit-21333.1.patch text/plain 1077 mark SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDM3MjM4KQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTAgQEAKKzIwMDgtMTAtMDMgIE1hcmsgTWVu dG92YWkgIDxtYXJrQG1veGllbmV0LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIHd0Zi9QbGF0Zm9ybS5oOiBBbGxvdyBFTkFCTEVfREFTSEJP QVJEX1NVUFBPUlQgYW5kCisJRU5BQkxFX01BQ19KQVZBX0JSSURHRSB0byBiZSBkaXNhYmxlZCBv biB0aGUgTWFjLgorCiAyMDA4LTEwLTAyICBPbGl2ZXIgSHVudCAgPG9saXZlckBhcHBsZS5jb20+ CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgTWFjaWVqIFN0YWNob3dpYWsuCkluZGV4OiBKYXZhU2Ny aXB0Q29yZS93dGYvUGxhdGZvcm0uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0Q29yZS93dGYv UGxhdGZvcm0uaAkocmV2aXNpb24gMzcyMzgpCisrKyBKYXZhU2NyaXB0Q29yZS93dGYvUGxhdGZv cm0uaAkod29ya2luZyBjb3B5KQpAQCAtMjU0LDggKzI1NCwxMiBAQAogI2lmIFBMQVRGT1JNKE1B QykKICNkZWZpbmUgV1RGX1BMQVRGT1JNX0NGIDEKICNkZWZpbmUgV1RGX1VTRV9QVEhSRUFEUyAx CisjaWYgIWRlZmluZWQoRU5BQkxFX01BQ19KQVZBX0JSSURHRSkKICNkZWZpbmUgRU5BQkxFX01B Q19KQVZBX0JSSURHRSAxCisjZW5kaWYKKyNpZiAhZGVmaW5lZChFTkFCTEVfREFTSEJPQVJEX1NV UFBPUlQpCiAjZGVmaW5lIEVOQUJMRV9EQVNIQk9BUkRfU1VQUE9SVCAxCisjZW5kaWYKICNkZWZp bmUgSEFWRV9SRUFETElORSAxCiAjaWYgIWRlZmluZWQoQlVJTERJTkdfT05fVElHRVIpICYmICFk ZWZpbmVkKEJVSUxESU5HX09OX0xFT1BBUkQpCiAjZGVmaW5lIEhBVkVfRFRSQUNFIDEK 24119 2008-10-06 13:24:57 -0700 2008-10-06 13:38:32 -0700 Wrap #defines in #ifndef webkit-21333.2.patch text/plain 1149 mark SW5kZXg6IEphdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZhU2NyaXB0 Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDM3MzM5KQorKysgSmF2YVNjcmlwdENvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMDgtMTAtMDYgIE1hcmsgTWVu dG92YWkgIDxtYXJrQG1veGllbmV0LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBBbGxvdyBFTkFCTEVfREFTSEJPQVJEX1NVUFBPUlQgYW5kIEVO QUJMRV9NQUNfSkFWQV9CUklER0UgdG8gYmUKKyAgICAgICAgZGlzYWJsZWQgb24gdGhlIE1hYy4K KworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEzMzMK KworICAgICAgICAqIHd0Zi9QbGF0Zm9ybS5oOgorCiAyMDA4LTEwLTA2ICBNYWNpZWogU3RhY2hv d2lhayAgPG1qc0BhcHBsZS5jb20+CiAKICAgICAgICAgTm90IHJldmlld2VkLiBCdWlsZCBmaXgu CkluZGV4OiBKYXZhU2NyaXB0Q29yZS93dGYvUGxhdGZvcm0uaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBKYXZh U2NyaXB0Q29yZS93dGYvUGxhdGZvcm0uaAkocmV2aXNpb24gMzczMzkpCisrKyBKYXZhU2NyaXB0 Q29yZS93dGYvUGxhdGZvcm0uaAkod29ya2luZyBjb3B5KQpAQCAtMjU0LDggKzI1NCwxMiBAQAog I2lmIFBMQVRGT1JNKE1BQykKICNkZWZpbmUgV1RGX1BMQVRGT1JNX0NGIDEKICNkZWZpbmUgV1RG X1VTRV9QVEhSRUFEUyAxCisjaWYgIWRlZmluZWQoRU5BQkxFX01BQ19KQVZBX0JSSURHRSkKICNk ZWZpbmUgRU5BQkxFX01BQ19KQVZBX0JSSURHRSAxCisjZW5kaWYKKyNpZiAhZGVmaW5lZChFTkFC TEVfREFTSEJPQVJEX1NVUFBPUlQpCiAjZGVmaW5lIEVOQUJMRV9EQVNIQk9BUkRfU1VQUE9SVCAx CisjZW5kaWYKICNkZWZpbmUgSEFWRV9SRUFETElORSAxCiAjaWYgIWRlZmluZWQoQlVJTERJTkdf T05fVElHRVIpICYmICFkZWZpbmVkKEJVSUxESU5HX09OX0xFT1BBUkQpCiAjZGVmaW5lIEhBVkVf RFRSQUNFIDEK