21338 2008-10-03 11:48:26 -0700 IDL files use #if defined(ENABLE_whatever) instead of #if ENABLE_whatever 2008-10-06 18:14:17 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 mark mark eric oldest_to_newest 93921 0 mark 2008-10-03 11:48:26 -0700 IDL files use #if defined(ENABLE_whatever) instead of #if ENABLE(whatever). This is a problem now that JavaScriptCore/wtf/Platform.h provides definitions for features that are supposed to be disabled, and features that are supposed to be disabled are properly #defined to 0. For example, in Chromium, we want WebKit database support off, and build with -DENABLE_DATABASE=0, but files like WebCore/page/DOMWindow.idl check for: #if defined(ENABLE_DATABASE) Because ENABLE_DATABASE is #defined (although to 0), the preprocessor allows the conditionalized section in. The check should be changed to: #if ENABLE(DATABASE) 93929 1 mark 2008-10-03 12:13:12 -0700 Followup: the IDL files should use #if ENABLE_WHATEVER directly, because they are preprocessed without wtf/Platform.h being included, and the ENABLE() macro is not available. 93946 2 24064 mark 2008-10-03 12:58:29 -0700 Created attachment 24064 grep -r ^#if.\*ENABLE_ . I tested this out in a regular WebKit Mac build, and it seems to do what's expected of it. 94024 3 24064 timothy 2008-10-03 19:13:03 -0700 Comment on attachment 24064 grep -r ^#if.\*ENABLE_ . Change is fine but please add a description and bug url to the changelog. 94252 4 24120 mark 2008-10-06 13:26:06 -0700 Created attachment 24120 grep -r ^#if.\*ENABLE . 94314 5 eric 2008-10-06 18:14:17 -0700 Committing to http://svn.webkit.org/repository/webkit/trunk ... M WebCore/ChangeLog M WebCore/bindings/objc/DOMEvents.h M WebCore/bindings/objc/PublicDOMInterfaces.h M WebCore/dom/Document.idl M WebCore/page/DOMWindow.idl M WebCore/svg/svgtags.in Committed r37362 24064 2008-10-03 12:58:29 -0700 2008-10-06 13:26:06 -0700 grep -r ^#if.\*ENABLE_ . webkit-21338.1.patch text/plain 6409 mark SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzNzI0OSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTcgQEAKKzIwMDgtMTAtMDMgIE1hcmsgTWVudG92YWkgIDxtYXJrQG1veGllbmV0 LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IGJpbmRpbmdzL29iamMvRE9NRXZlbnRzLmg6CisgICAgICAgICogYmluZGluZ3Mvb2JqYy9QdWJs aWNET01JbnRlcmZhY2VzLmg6CisgICAgICAgICogZG9tL0RvY3VtZW50LmlkbDoKKyAgICAgICAg KiBwYWdlL0RPTVdpbmRvdy5pZGw6CisgICAgICAgICogc3ZnL3N2Z3RhZ3MuaW46CisgICAgICAg IFVzZSAjaWYgRU5BQkxFKGZlYXR1cmUpIHdoZXJlIHBvc3NpYmxlLCBhbmQgI2lmIEVOQUJMRV9m ZWF0dXJlIHdoZXJlCisgICAgICAgIFBsYXRmb3JtLmggaXMgbm90IGF2YWlsYWJsZSwgaW4gcHJl ZmVyZW5jZSB0byAjaWZkZWYgRU5BQkxFX2ZlYXR1cmUuCisgICAgICAgICNpZmRlZiBpcyB3cm9u ZyBub3cgdGhhdCBmZWF0dXJlcyBhcmUgZGlzYWJsZWQgYnkgI2RlZmluaW5nCisgICAgICAgIEVO QUJMRV9mZWF0dXJlIHRvIDAuCisKIDIwMDgtMTAtMDMgIERhdmlkIEh5YXR0ICA8aHlhdHRAYXBw bGUuY29tPgogCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMTM0MApJbmRleDogV2ViQ29yZS9iaW5kaW5ncy9vYmpjL0RPTUV2ZW50cy5oCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYkNvcmUvYmluZGluZ3Mvb2JqYy9ET01FdmVudHMuaAkocmV2aXNpb24gMzcyMzgp CisrKyBXZWJDb3JlL2JpbmRpbmdzL29iamMvRE9NRXZlbnRzLmgJKHdvcmtpbmcgY29weSkKQEAg LTQzLDggKzQzLDcgQEAKIEBpbnRlcmZhY2UgRE9NTm9kZSAoRE9NRXZlbnRUYXJnZXQpIDxET01F dmVudFRhcmdldD4KIEBlbmQKIAotLy8gVXNpbmcgRU5BQkxFKFNWRykgcmVzdWx0cyBpbiBhIGNv bXBpbGF0aW9uIGVycm9yLgotI2lmZGVmIEVOQUJMRV9TVkcKKyNpZiBFTkFCTEUoU1ZHKQogI2lt cG9ydCA8V2ViQ29yZS9ET01TVkdFbGVtZW50SW5zdGFuY2UuaD4KIEBpbnRlcmZhY2UgRE9NU1ZH RWxlbWVudEluc3RhbmNlIChET01FdmVudFRhcmdldCkgPERPTUV2ZW50VGFyZ2V0PgogQGVuZApJ bmRleDogV2ViQ29yZS9iaW5kaW5ncy9vYmpjL1B1YmxpY0RPTUludGVyZmFjZXMuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBXZWJDb3JlL2JpbmRpbmdzL29iamMvUHVibGljRE9NSW50ZXJmYWNlcy5oCShyZXZp c2lvbiAzNzIzOCkKKysrIFdlYkNvcmUvYmluZGluZ3Mvb2JqYy9QdWJsaWNET01JbnRlcmZhY2Vz LmgJKHdvcmtpbmcgY29weSkKQEAgLTEyMSw3ICsxMjEsNyBAQAogLSAoRE9NQ1NTUnVsZUxpc3Qg KilnZXRNYXRjaGVkQ1NTUnVsZXM6KERPTUVsZW1lbnQgKillbGVtZW50IHBzZXVkb0VsZW1lbnQ6 KE5TU3RyaW5nICopcHNldWRvRWxlbWVudDsKIC0gKERPTUNTU1J1bGVMaXN0ICopZ2V0TWF0Y2hl ZENTU1J1bGVzOihET01FbGVtZW50ICopZWxlbWVudCBwc2V1ZG9FbGVtZW50OihOU1N0cmluZyAq KXBzZXVkb0VsZW1lbnQgYXV0aG9yT25seTooQk9PTClhdXRob3JPbmx5OwogLSAoRE9NTm9kZUxp c3QgKilnZXRFbGVtZW50c0J5TmFtZTooTlNTdHJpbmcgKillbGVtZW50TmFtZTsKLSNpZmRlZiBF TkFCTEVfWFBBVEgKKyNpZiBFTkFCTEVfWFBBVEgKIC0gKERPTVhQYXRoRXhwcmVzc2lvbiAqKWNy ZWF0ZUV4cHJlc3Npb246KE5TU3RyaW5nICopZXhwcmVzc2lvbiA6KGlkIDxET01YUGF0aE5TUmVz b2x2ZXI+KXJlc29sdmVyOwogLSAoRE9NWFBhdGhFeHByZXNzaW9uICopY3JlYXRlRXhwcmVzc2lv bjooTlNTdHJpbmcgKilleHByZXNzaW9uIHJlc29sdmVyOihpZCA8RE9NWFBhdGhOU1Jlc29sdmVy PilyZXNvbHZlcjsKIC0gKGlkIDxET01YUGF0aE5TUmVzb2x2ZXI+KWNyZWF0ZU5TUmVzb2x2ZXI6 KERPTU5vZGUgKilub2RlUmVzb2x2ZXI7CkluZGV4OiBXZWJDb3JlL2RvbS9Eb2N1bWVudC5pZGwK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gV2ViQ29yZS9kb20vRG9jdW1lbnQuaWRsCShyZXZpc2lvbiAzNzIzOCkK KysrIFdlYkNvcmUvZG9tL0RvY3VtZW50LmlkbAkod29ya2luZyBjb3B5KQpAQCAtMTE4LDcgKzEx OCw3IEBAIG1vZHVsZSBjb3JlIHsKIAogICAgICAgICBbT2xkU3R5bGVPYmpDXSBDU1NTdHlsZURl Y2xhcmF0aW9uIGdldE92ZXJyaWRlU3R5bGUoaW4gRWxlbWVudCBlbGVtZW50LAogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW4gRE9N U3RyaW5nIHBzZXVkb0VsZW1lbnQpOwotI2lmZGVmIEVOQUJMRV9YUEFUSAorI2lmIEVOQUJMRV9Y UEFUSAogICAgICAgICAvLyBET00gTGV2ZWwgMyBYUGF0aCAoWFBhdGhFdmFsdWF0b3IgaW50ZXJm YWNlKQogICAgICAgICBbT2xkU3R5bGVPYmpDXSBYUGF0aEV4cHJlc3Npb24gY3JlYXRlRXhwcmVz c2lvbihpbiBET01TdHJpbmcgZXhwcmVzc2lvbiwKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW4gWFBhdGhOU1Jlc29sdmVyIHJlc29sdmVy KQpJbmRleDogV2ViQ29yZS9wYWdlL0RPTVdpbmRvdy5pZGwKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29y ZS9wYWdlL0RPTVdpbmRvdy5pZGwJKHJldmlzaW9uIDM3MjM4KQorKysgV2ViQ29yZS9wYWdlL0RP TVdpbmRvdy5pZGwJKHdvcmtpbmcgY29weSkKQEAgLTEzNiwxNCArMTM2LDE0IEBAIG1vZHVsZSB3 aW5kb3cgewogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW4gW09wdGlv bmFsXSBib29sZWFuIGF1dGhvck9ubHkpOwogICAgICAgICBhdHRyaWJ1dGUgW1JlcGxhY2VhYmxl XSBkb3VibGUgZGV2aWNlUGl4ZWxSYXRpbzsKIAotI2lmIGRlZmluZWQoRU5BQkxFX09GRkxJTkVf V0VCX0FQUExJQ0FUSU9OUykKKyNpZiBFTkFCTEVfT0ZGTElORV9XRUJfQVBQTElDQVRJT05TCiAg ICAgICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSBET01BcHBsaWNhdGlvbkNhY2hlIGFwcGxpY2F0aW9u Q2FjaGU7CiAjZW5kaWYgICAgCi0jaWYgZGVmaW5lZChFTkFCTEVfREFUQUJBU0UpCisjaWYgRU5B QkxFX0RBVEFCQVNFCiAgICAgICAgIERhdGFiYXNlIG9wZW5EYXRhYmFzZShpbiBET01TdHJpbmcg bmFtZSwgaW4gRE9NU3RyaW5nIHZlcnNpb24sIGluIERPTVN0cmluZyBkaXNwbGF5TmFtZSwgaW4g dW5zaWduZWQgbG9uZyBlc3RpbWF0ZWRTaXplKQogICAgICAgICAgICAgcmFpc2VzKERPTUV4Y2Vw dGlvbik7CiAjZW5kaWYKLSNpZiBkZWZpbmVkKEVOQUJMRV9ET01fU1RPUkFHRSkKKyNpZiBFTkFC TEVfRE9NX1NUT1JBR0UKICAgICAgICAgcmVhZG9ubHkgYXR0cmlidXRlIFN0b3JhZ2Ugc2Vzc2lv blN0b3JhZ2U7CiAgICAgICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSBTdG9yYWdlIGxvY2FsU3RvcmFn ZTsKICNlbmRpZgpAQCAtMzYyLDI1ICszNjIsMjUgQEAgbW9kdWxlIHdpbmRvdyB7CiAgICAgICAg IGF0dHJpYnV0ZSBYTUxIdHRwUmVxdWVzdFVwbG9hZENvbnN0cnVjdG9yIFhNTEh0dHBSZXF1ZXN0 VXBsb2FkOwogICAgICAgICBhdHRyaWJ1dGUgWE1MSHR0cFJlcXVlc3RFeGNlcHRpb25Db25zdHJ1 Y3RvciBYTUxIdHRwUmVxdWVzdEV4Y2VwdGlvbjsKIAotI2lmIGRlZmluZWQoRU5BQkxFX0RPTV9T VE9SQUdFKQorI2lmIEVOQUJMRV9ET01fU1RPUkFHRQogICAgICAgICBhdHRyaWJ1dGUgU3RvcmFn ZUNvbnN0cnVjdG9yIFN0b3JhZ2U7CiAgICAgICAgIGF0dHJpYnV0ZSBTdG9yYWdlRXZlbnRDb25z dHJ1Y3RvciBTdG9yYWdlRXZlbnQ7CiAjZW5kaWYKIAotI2lmIGRlZmluZWQoRU5BQkxFX1ZJREVP KQorI2lmIEVOQUJMRV9WSURFTwogICAgICAgICBhdHRyaWJ1dGUgSFRNTEF1ZGlvRWxlbWVudENv bnN0cnVjdG9yIEhUTUxBdWRpb0VsZW1lbnQ7CiAgICAgICAgIGF0dHJpYnV0ZSBIVE1MTWVkaWFF bGVtZW50Q29uc3RydWN0b3IgSFRNTE1lZGlhRWxlbWVudDsKICAgICAgICAgYXR0cmlidXRlIEhU TUxWaWRlb0VsZW1lbnRDb25zdHJ1Y3RvciBIVE1MVmlkZW9FbGVtZW50OwogICAgICAgICBhdHRy aWJ1dGUgTWVkaWFFcnJvckNvbnN0cnVjdG9yIE1lZGlhRXJyb3I7CiAjZW5kaWYKIAotI2lmIGRl ZmluZWQoRU5BQkxFX1hQQVRIKQorI2lmIEVOQUJMRV9YUEFUSAogICAgICAgICBhdHRyaWJ1dGUg WFBhdGhFdmFsdWF0b3JDb25zdHJ1Y3RvciBYUGF0aEV2YWx1YXRvcjsKICAgICAgICAgYXR0cmli dXRlIFhQYXRoUmVzdWx0Q29uc3RydWN0b3IgWFBhdGhSZXN1bHQ7CiAgICAgICAgIGF0dHJpYnV0 ZSBYUGF0aEV4Y2VwdGlvbkNvbnN0cnVjdG9yIFhQYXRoRXhjZXB0aW9uOwogI2VuZGlmCiAKLSNp ZiBkZWZpbmVkKEVOQUJMRV9TVkcpCisjaWYgRU5BQkxFX1NWRwogICAgICAgICBhdHRyaWJ1dGUg U1ZHQW5nbGVDb25zdHJ1Y3RvciBTVkdBbmdsZTsKICAgICAgICAgYXR0cmlidXRlIFNWR0NvbG9y Q29uc3RydWN0b3IgU1ZHQ29sb3I7CiAvLyAgICAgIGF0dHJpYnV0ZSBTVkdDU1NSdWxlQ29uc3Ry dWN0b3IgU1ZHQ1NTUnVsZTsKQEAgLTM5OSw3ICszOTksNyBAQCBtb2R1bGUgd2luZG93IHsKIC8v ICAgICAgYXR0cmlidXRlIFNWR1pvb21BbmRQYW5Db25zdHJ1Y3RvciBTVkdab29tQW5kUGFuOwog I2VuZGlmCiAKLSNpZiBkZWZpbmVkKEVOQUJMRURfU1ZHX0ZJTFRFUlMpCisjaWYgRU5BQkxFX1NW R19GSUxURVJTCiAgICAgICAgIGF0dHJpYnV0ZSBTVkdDb21wb25lbnRUcmFuc2ZlckZ1bmN0aW9u RWxlbWVudENvbnN0cnVjdG9yIFNWR0NvbXBvbmVudFRyYW5zZmVyRnVuY3Rpb25FbGVtZW50Owog ICAgICAgICBhdHRyaWJ1dGUgU1ZHRkVCbGVuZEVsZW1lbnRDb25zdHJ1Y3RvciBTVkdGRUJsZW5k RWxlbWVudDsKICAgICAgICAgYXR0cmlidXRlIFNWR0ZFQ29sb3JNYXRyaXhFbGVtZW50Q29uc3Ry dWN0b3IgU1ZHRkVDb2xvck1hdHJpeEVsZW1lbnQ7CkluZGV4OiBXZWJDb3JlL3N2Zy9zdmd0YWdz LmluCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvc3ZnL3N2Z3RhZ3MuaW4JKHJldmlzaW9uIDM3MjM4 KQorKysgV2ViQ29yZS9zdmcvc3ZndGFncy5pbgkod29ya2luZyBjb3B5KQpAQCAtMTEsNyArMTEs NyBAQCBhbHRHbHlwaAogYWx0R2x5cGhEZWYKIGFsdEdseXBoSXRlbQogI2VuZGlmCi0jaWZkZWYg RU5BQkxFX1NWR19BTklNQVRJT04KKyNpZiBFTkFCTEVfU1ZHX0FOSU1BVElPTgogYW5pbWF0ZQog YW5pbWF0ZUNvbG9yCiBhbmltYXRlTW90aW9uCkBAIC0zMCw3ICszMCw3IEBAIGRlZmluaXRpb25f c3JjCiBkZWZzCiBkZXNjCiBlbGxpcHNlCi0jaWZkZWYgRU5BQkxFX1NWR19GSUxURVJTCisjaWYg RU5BQkxFX1NWR19GSUxURVJTCiBmZUJsZW5kCiBmZUNvbG9yTWF0cml4CiBmZUNvbXBvbmVudFRy YW5zZmVyCkBAIC02MSw3ICs2MSw3IEBAIGZlVGlsZQogZmVUdXJidWxlbmNlCiBmaWx0ZXIKICNl bmRpZgotI2lmZGVmIEVOQUJMRV9TVkdfRk9OVFMKKyNpZiBFTkFCTEVfU1ZHX0ZPTlRTCiBmb250 CiBmb250X2ZhY2UKIGZvbnRfZmFjZV9mb3JtYXQKQEAgLTY5LDE3ICs2OSwxNyBAQCBmb250X2Zh Y2VfbmFtZQogZm9udF9mYWNlX3NyYwogZm9udF9mYWNlX3VyaQogI2VuZGlmCi0jaWZkZWYgRU5B QkxFX1NWR19GT1JFSUdOX09CSkVDVAorI2lmIEVOQUJMRV9TVkdfRk9SRUlHTl9PQkpFQ1QKIGZv cmVpZ25PYmplY3QKICNlbmRpZgogZwotI2lmZGVmIEVOQUJMRV9TVkdfRk9OVFMKKyNpZiBFTkFC TEVfU1ZHX0ZPTlRTCiBnbHlwaAogI2VuZGlmCiAjaWYgMAogZ2x5cGhSZWYKICNlbmRpZgotI2lm ZGVmIEVOQUJMRV9TVkdfRk9OVFMKKyNpZiBFTkFCTEVfU1ZHX0ZPTlRTCiBoa2VybiBpbnRlcmZh Y2VOYW1lPUhLZXJuRWxlbWVudAogI2VuZGlmCiBpbWFnZQpAQCAtODgsNyArODgsNyBAQCBsaW5l YXJHcmFkaWVudAogbWFya2VyCiBtYXNrCiBtZXRhZGF0YQotI2lmZGVmIEVOQUJMRV9TVkdfRk9O VFMKKyNpZiBFTkFCTEVfU1ZHX0ZPTlRTCiBtaXNzaW5nX2dseXBoCiAjZW5kaWYKIG1wYXRoIGlu dGVyZmFjZU5hbWU9TVBhdGhFbGVtZW50Cg== 24120 2008-10-06 13:26:06 -0700 2008-10-06 13:38:11 -0700 grep -r ^#if.\*ENABLE . webkit-21338.2.patch text/plain 6484 mark SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiAzNzMzOSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjAgQEAKKzIwMDgtMTAtMDYgIE1hcmsgTWVudG92YWkgIDxtYXJrQG1veGllbmV0 LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBV c2UgI2lmIEVOQUJMRShmZWF0dXJlKSB3aGVyZSBwb3NzaWJsZSwgYW5kICNpZiBFTkFCTEVfZmVh dHVyZSB3aGVyZQorICAgICAgICBQbGF0Zm9ybS5oIGlzIG5vdCBhdmFpbGFibGUsIGluIHByZWZl cmVuY2UgdG8gI2lmZGVmIEVOQUJMRV9mZWF0dXJlLgorICAgICAgICAjaWZkZWYgaXMgd3Jvbmcg bm93IHRoYXQgZmVhdHVyZXMgYXJlIGRpc2FibGVkIGJ5ICNkZWZpbmluZworICAgICAgICBFTkFC TEVfZmVhdHVyZSB0byAwLgorCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMTMzOAorCisgICAgICAgICogYmluZGluZ3Mvb2JqYy9ET01FdmVudHMuaDoK KyAgICAgICAgKiBiaW5kaW5ncy9vYmpjL1B1YmxpY0RPTUludGVyZmFjZXMuaDoKKyAgICAgICAg KiBkb20vRG9jdW1lbnQuaWRsOgorICAgICAgICAqIHBhZ2UvRE9NV2luZG93LmlkbDoKKyAgICAg ICAgKiBzdmcvc3ZndGFncy5pbjoKKwogMjAwOC0xMC0wMyAgU3RldmUgRmFsa2VuYnVyZyAgPHNm YWxrZW5AYXBwbGUuY29tPgogCiAgICAgICAgIDxyZGFyOi8vcHJvYmxlbS82MjQ5ODMzPiBGaXgg ZGVmYXVsdCBidXR0b24gYXBwZWFyYW5jZQpJbmRleDogV2ViQ29yZS9iaW5kaW5ncy9vYmpjL0RP TUV2ZW50cy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYmluZGluZ3Mvb2JqYy9ET01FdmVudHMu aAkocmV2aXNpb24gMzczMzkpCisrKyBXZWJDb3JlL2JpbmRpbmdzL29iamMvRE9NRXZlbnRzLmgJ KHdvcmtpbmcgY29weSkKQEAgLTQzLDggKzQzLDcgQEAKIEBpbnRlcmZhY2UgRE9NTm9kZSAoRE9N RXZlbnRUYXJnZXQpIDxET01FdmVudFRhcmdldD4KIEBlbmQKIAotLy8gVXNpbmcgRU5BQkxFKFNW RykgcmVzdWx0cyBpbiBhIGNvbXBpbGF0aW9uIGVycm9yLgotI2lmZGVmIEVOQUJMRV9TVkcKKyNp ZiBFTkFCTEUoU1ZHKQogI2ltcG9ydCA8V2ViQ29yZS9ET01TVkdFbGVtZW50SW5zdGFuY2UuaD4K IEBpbnRlcmZhY2UgRE9NU1ZHRWxlbWVudEluc3RhbmNlIChET01FdmVudFRhcmdldCkgPERPTUV2 ZW50VGFyZ2V0PgogQGVuZApJbmRleDogV2ViQ29yZS9iaW5kaW5ncy9vYmpjL1B1YmxpY0RPTUlu dGVyZmFjZXMuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2JpbmRpbmdzL29iamMvUHVibGljRE9N SW50ZXJmYWNlcy5oCShyZXZpc2lvbiAzNzMzOSkKKysrIFdlYkNvcmUvYmluZGluZ3Mvb2JqYy9Q dWJsaWNET01JbnRlcmZhY2VzLmgJKHdvcmtpbmcgY29weSkKQEAgLTEyMSw3ICsxMjEsNyBAQAog LSAoRE9NQ1NTUnVsZUxpc3QgKilnZXRNYXRjaGVkQ1NTUnVsZXM6KERPTUVsZW1lbnQgKillbGVt ZW50IHBzZXVkb0VsZW1lbnQ6KE5TU3RyaW5nICopcHNldWRvRWxlbWVudDsKIC0gKERPTUNTU1J1 bGVMaXN0ICopZ2V0TWF0Y2hlZENTU1J1bGVzOihET01FbGVtZW50ICopZWxlbWVudCBwc2V1ZG9F bGVtZW50OihOU1N0cmluZyAqKXBzZXVkb0VsZW1lbnQgYXV0aG9yT25seTooQk9PTClhdXRob3JP bmx5OwogLSAoRE9NTm9kZUxpc3QgKilnZXRFbGVtZW50c0J5TmFtZTooTlNTdHJpbmcgKillbGVt ZW50TmFtZTsKLSNpZmRlZiBFTkFCTEVfWFBBVEgKKyNpZiBFTkFCTEVfWFBBVEgKIC0gKERPTVhQ YXRoRXhwcmVzc2lvbiAqKWNyZWF0ZUV4cHJlc3Npb246KE5TU3RyaW5nICopZXhwcmVzc2lvbiA6 KGlkIDxET01YUGF0aE5TUmVzb2x2ZXI+KXJlc29sdmVyOwogLSAoRE9NWFBhdGhFeHByZXNzaW9u ICopY3JlYXRlRXhwcmVzc2lvbjooTlNTdHJpbmcgKilleHByZXNzaW9uIHJlc29sdmVyOihpZCA8 RE9NWFBhdGhOU1Jlc29sdmVyPilyZXNvbHZlcjsKIC0gKGlkIDxET01YUGF0aE5TUmVzb2x2ZXI+ KWNyZWF0ZU5TUmVzb2x2ZXI6KERPTU5vZGUgKilub2RlUmVzb2x2ZXI7CkluZGV4OiBXZWJDb3Jl L2RvbS9Eb2N1bWVudC5pZGwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9kb20vRG9jdW1lbnQuaWRs CShyZXZpc2lvbiAzNzMzOSkKKysrIFdlYkNvcmUvZG9tL0RvY3VtZW50LmlkbAkod29ya2luZyBj b3B5KQpAQCAtMTE4LDcgKzExOCw3IEBAIG1vZHVsZSBjb3JlIHsKIAogICAgICAgICBbT2xkU3R5 bGVPYmpDXSBDU1NTdHlsZURlY2xhcmF0aW9uIGdldE92ZXJyaWRlU3R5bGUoaW4gRWxlbWVudCBl bGVtZW50LAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgaW4gRE9NU3RyaW5nIHBzZXVkb0VsZW1lbnQpOwotI2lmZGVmIEVOQUJMRV9Y UEFUSAorI2lmIEVOQUJMRV9YUEFUSAogICAgICAgICAvLyBET00gTGV2ZWwgMyBYUGF0aCAoWFBh dGhFdmFsdWF0b3IgaW50ZXJmYWNlKQogICAgICAgICBbT2xkU3R5bGVPYmpDXSBYUGF0aEV4cHJl c3Npb24gY3JlYXRlRXhwcmVzc2lvbihpbiBET01TdHJpbmcgZXhwcmVzc2lvbiwKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW4gWFBhdGhO U1Jlc29sdmVyIHJlc29sdmVyKQpJbmRleDogV2ViQ29yZS9wYWdlL0RPTVdpbmRvdy5pZGwKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gV2ViQ29yZS9wYWdlL0RPTVdpbmRvdy5pZGwJKHJldmlzaW9uIDM3MzM5KQor KysgV2ViQ29yZS9wYWdlL0RPTVdpbmRvdy5pZGwJKHdvcmtpbmcgY29weSkKQEAgLTEzNiwxNCAr MTM2LDE0IEBAIG1vZHVsZSB3aW5kb3cgewogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgaW4gW09wdGlvbmFsXSBib29sZWFuIGF1dGhvck9ubHkpOwogICAgICAgICBhdHRy aWJ1dGUgW1JlcGxhY2VhYmxlXSBkb3VibGUgZGV2aWNlUGl4ZWxSYXRpbzsKIAotI2lmIGRlZmlu ZWQoRU5BQkxFX09GRkxJTkVfV0VCX0FQUExJQ0FUSU9OUykKKyNpZiBFTkFCTEVfT0ZGTElORV9X RUJfQVBQTElDQVRJT05TCiAgICAgICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSBET01BcHBsaWNhdGlv bkNhY2hlIGFwcGxpY2F0aW9uQ2FjaGU7CiAjZW5kaWYgICAgCi0jaWYgZGVmaW5lZChFTkFCTEVf REFUQUJBU0UpCisjaWYgRU5BQkxFX0RBVEFCQVNFCiAgICAgICAgIERhdGFiYXNlIG9wZW5EYXRh YmFzZShpbiBET01TdHJpbmcgbmFtZSwgaW4gRE9NU3RyaW5nIHZlcnNpb24sIGluIERPTVN0cmlu ZyBkaXNwbGF5TmFtZSwgaW4gdW5zaWduZWQgbG9uZyBlc3RpbWF0ZWRTaXplKQogICAgICAgICAg ICAgcmFpc2VzKERPTUV4Y2VwdGlvbik7CiAjZW5kaWYKLSNpZiBkZWZpbmVkKEVOQUJMRV9ET01f U1RPUkFHRSkKKyNpZiBFTkFCTEVfRE9NX1NUT1JBR0UKICAgICAgICAgcmVhZG9ubHkgYXR0cmli dXRlIFN0b3JhZ2Ugc2Vzc2lvblN0b3JhZ2U7CiAgICAgICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSBT dG9yYWdlIGxvY2FsU3RvcmFnZTsKICNlbmRpZgpAQCAtMzYyLDI1ICszNjIsMjUgQEAgbW9kdWxl IHdpbmRvdyB7CiAgICAgICAgIGF0dHJpYnV0ZSBYTUxIdHRwUmVxdWVzdFVwbG9hZENvbnN0cnVj dG9yIFhNTEh0dHBSZXF1ZXN0VXBsb2FkOwogICAgICAgICBhdHRyaWJ1dGUgWE1MSHR0cFJlcXVl c3RFeGNlcHRpb25Db25zdHJ1Y3RvciBYTUxIdHRwUmVxdWVzdEV4Y2VwdGlvbjsKIAotI2lmIGRl ZmluZWQoRU5BQkxFX0RPTV9TVE9SQUdFKQorI2lmIEVOQUJMRV9ET01fU1RPUkFHRQogICAgICAg ICBhdHRyaWJ1dGUgU3RvcmFnZUNvbnN0cnVjdG9yIFN0b3JhZ2U7CiAgICAgICAgIGF0dHJpYnV0 ZSBTdG9yYWdlRXZlbnRDb25zdHJ1Y3RvciBTdG9yYWdlRXZlbnQ7CiAjZW5kaWYKIAotI2lmIGRl ZmluZWQoRU5BQkxFX1ZJREVPKQorI2lmIEVOQUJMRV9WSURFTwogICAgICAgICBhdHRyaWJ1dGUg SFRNTEF1ZGlvRWxlbWVudENvbnN0cnVjdG9yIEhUTUxBdWRpb0VsZW1lbnQ7CiAgICAgICAgIGF0 dHJpYnV0ZSBIVE1MTWVkaWFFbGVtZW50Q29uc3RydWN0b3IgSFRNTE1lZGlhRWxlbWVudDsKICAg ICAgICAgYXR0cmlidXRlIEhUTUxWaWRlb0VsZW1lbnRDb25zdHJ1Y3RvciBIVE1MVmlkZW9FbGVt ZW50OwogICAgICAgICBhdHRyaWJ1dGUgTWVkaWFFcnJvckNvbnN0cnVjdG9yIE1lZGlhRXJyb3I7 CiAjZW5kaWYKIAotI2lmIGRlZmluZWQoRU5BQkxFX1hQQVRIKQorI2lmIEVOQUJMRV9YUEFUSAog ICAgICAgICBhdHRyaWJ1dGUgWFBhdGhFdmFsdWF0b3JDb25zdHJ1Y3RvciBYUGF0aEV2YWx1YXRv cjsKICAgICAgICAgYXR0cmlidXRlIFhQYXRoUmVzdWx0Q29uc3RydWN0b3IgWFBhdGhSZXN1bHQ7 CiAgICAgICAgIGF0dHJpYnV0ZSBYUGF0aEV4Y2VwdGlvbkNvbnN0cnVjdG9yIFhQYXRoRXhjZXB0 aW9uOwogI2VuZGlmCiAKLSNpZiBkZWZpbmVkKEVOQUJMRV9TVkcpCisjaWYgRU5BQkxFX1NWRwog ICAgICAgICBhdHRyaWJ1dGUgU1ZHQW5nbGVDb25zdHJ1Y3RvciBTVkdBbmdsZTsKICAgICAgICAg YXR0cmlidXRlIFNWR0NvbG9yQ29uc3RydWN0b3IgU1ZHQ29sb3I7CiAvLyAgICAgIGF0dHJpYnV0 ZSBTVkdDU1NSdWxlQ29uc3RydWN0b3IgU1ZHQ1NTUnVsZTsKQEAgLTM5OSw3ICszOTksNyBAQCBt b2R1bGUgd2luZG93IHsKIC8vICAgICAgYXR0cmlidXRlIFNWR1pvb21BbmRQYW5Db25zdHJ1Y3Rv ciBTVkdab29tQW5kUGFuOwogI2VuZGlmCiAKLSNpZiBkZWZpbmVkKEVOQUJMRURfU1ZHX0ZJTFRF UlMpCisjaWYgRU5BQkxFX1NWR19GSUxURVJTCiAgICAgICAgIGF0dHJpYnV0ZSBTVkdDb21wb25l bnRUcmFuc2ZlckZ1bmN0aW9uRWxlbWVudENvbnN0cnVjdG9yIFNWR0NvbXBvbmVudFRyYW5zZmVy RnVuY3Rpb25FbGVtZW50OwogICAgICAgICBhdHRyaWJ1dGUgU1ZHRkVCbGVuZEVsZW1lbnRDb25z dHJ1Y3RvciBTVkdGRUJsZW5kRWxlbWVudDsKICAgICAgICAgYXR0cmlidXRlIFNWR0ZFQ29sb3JN YXRyaXhFbGVtZW50Q29uc3RydWN0b3IgU1ZHRkVDb2xvck1hdHJpeEVsZW1lbnQ7CkluZGV4OiBX ZWJDb3JlL3N2Zy9zdmd0YWdzLmluCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvc3ZnL3N2Z3RhZ3Mu aW4JKHJldmlzaW9uIDM3MzM5KQorKysgV2ViQ29yZS9zdmcvc3ZndGFncy5pbgkod29ya2luZyBj b3B5KQpAQCAtMTEsNyArMTEsNyBAQCBhbHRHbHlwaAogYWx0R2x5cGhEZWYKIGFsdEdseXBoSXRl bQogI2VuZGlmCi0jaWZkZWYgRU5BQkxFX1NWR19BTklNQVRJT04KKyNpZiBFTkFCTEVfU1ZHX0FO SU1BVElPTgogYW5pbWF0ZQogYW5pbWF0ZUNvbG9yCiBhbmltYXRlTW90aW9uCkBAIC0zMCw3ICsz MCw3IEBAIGRlZmluaXRpb25fc3JjCiBkZWZzCiBkZXNjCiBlbGxpcHNlCi0jaWZkZWYgRU5BQkxF X1NWR19GSUxURVJTCisjaWYgRU5BQkxFX1NWR19GSUxURVJTCiBmZUJsZW5kCiBmZUNvbG9yTWF0 cml4CiBmZUNvbXBvbmVudFRyYW5zZmVyCkBAIC02MSw3ICs2MSw3IEBAIGZlVGlsZQogZmVUdXJi dWxlbmNlCiBmaWx0ZXIKICNlbmRpZgotI2lmZGVmIEVOQUJMRV9TVkdfRk9OVFMKKyNpZiBFTkFC TEVfU1ZHX0ZPTlRTCiBmb250CiBmb250X2ZhY2UKIGZvbnRfZmFjZV9mb3JtYXQKQEAgLTY5LDE3 ICs2OSwxNyBAQCBmb250X2ZhY2VfbmFtZQogZm9udF9mYWNlX3NyYwogZm9udF9mYWNlX3VyaQog I2VuZGlmCi0jaWZkZWYgRU5BQkxFX1NWR19GT1JFSUdOX09CSkVDVAorI2lmIEVOQUJMRV9TVkdf Rk9SRUlHTl9PQkpFQ1QKIGZvcmVpZ25PYmplY3QKICNlbmRpZgogZwotI2lmZGVmIEVOQUJMRV9T VkdfRk9OVFMKKyNpZiBFTkFCTEVfU1ZHX0ZPTlRTCiBnbHlwaAogI2VuZGlmCiAjaWYgMAogZ2x5 cGhSZWYKICNlbmRpZgotI2lmZGVmIEVOQUJMRV9TVkdfRk9OVFMKKyNpZiBFTkFCTEVfU1ZHX0ZP TlRTCiBoa2VybiBpbnRlcmZhY2VOYW1lPUhLZXJuRWxlbWVudAogI2VuZGlmCiBpbWFnZQpAQCAt ODgsNyArODgsNyBAQCBsaW5lYXJHcmFkaWVudAogbWFya2VyCiBtYXNrCiBtZXRhZGF0YQotI2lm ZGVmIEVOQUJMRV9TVkdfRk9OVFMKKyNpZiBFTkFCTEVfU1ZHX0ZPTlRTCiBtaXNzaW5nX2dseXBo CiAjZW5kaWYKIG1wYXRoIGludGVyZmFjZU5hbWU9TVBhdGhFbGVtZW50Cg==