From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1J2Xbf-0005xB-Lf for qemu-devel@nongnu.org; Wed, 12 Dec 2007 14:50:59 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1J2Xbb-0005ux-TB for qemu-devel@nongnu.org; Wed, 12 Dec 2007 14:50:59 -0500 Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1J2Xbb-0005um-NC for qemu-devel@nongnu.org; Wed, 12 Dec 2007 14:50:55 -0500 Received: from wa-out-1112.google.com ([209.85.146.178]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1J2Xba-00009O-3h for qemu-devel@nongnu.org; Wed, 12 Dec 2007 14:50:55 -0500 Received: by wa-out-1112.google.com with SMTP id k22so633483waf.18 for ; Wed, 12 Dec 2007 11:50:49 -0800 (PST) Message-ID: <83a4d4ca0712121150q6b7ec678yb64eb7a5f2dbb363@mail.gmail.com> Date: Wed, 12 Dec 2007 20:50:48 +0100 From: "Eduardo Felipe" Subject: Re: [Qemu-devel] Windows build broken In-Reply-To: MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="----=_Part_7211_12497944.1197489049114" References: <802848.87427.qm@web57002.mail.re3.yahoo.com> <83a4d4ca0712120241n77b602a3v22990b2bb12ca4e2@mail.gmail.com> Reply-To: qemu-devel@nongnu.org List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org ------=_Part_7211_12497944.1197489049114 Content-Type: multipart/alternative; boundary="----=_Part_7212_8111988.1197489049114" ------=_Part_7212_8111988.1197489049114 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline 2007/12/12, C.W. Betts : > > Could you perhaps give a patch? I don't feel like going through and > changing every instance of BlockInterfaceType to something else. > Having a closer look I think the underlying problem is a name conflict with a #define in Mingw's header file basetyps.h, so renaming variables looks right to me. Patch attached. Regards, ------=_Part_7212_8111988.1197489049114 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline
2007/12/12, C.W. Betts <computers57@hotmail.com>:
Could you perhaps give a patch?  I don't feel like going through and changing every instance of BlockInterfaceType to something else.

Having a closer look I think the underlying problem is a name conflict with a #define in Mingw's header file basetyps.h, so renaming variables looks right to me. Patch attached.

Regards,


------=_Part_7212_8111988.1197489049114-- ------=_Part_7211_12497944.1197489049114 Content-Type: text/x-patch; name=rename_interface.patch Content-Transfer-Encoding: base64 X-Attachment-Id: f_fa49pdxv Content-Disposition: attachment; filename=rename_interface.patch DQoqKiogc3lzZW11LmgNCi0tLSBzeXNlbXUuaA0KLS0tIHN5c2VtdS5oCTIgRGVjIDIwMDcgMDQ6 NTE6MDggLTAwMDAJMS4yDQorKysgc3lzZW11LmgJMTIgRGVjIDIwMDcgMTk6MTc6NDcgLTAwMDAN CkBAIC0xMjIsNyArMTIyLDcgQEANCiANCiB0eXBlZGVmIHN0cnVjdCBEcml2ZUluZm8gew0KICAg ICBCbG9ja0RyaXZlclN0YXRlICpiZHJ2Ow0KLSAgICBCbG9ja0ludGVyZmFjZVR5cGUgaW50ZXJm YWNlOw0KKyAgICBCbG9ja0ludGVyZmFjZVR5cGUgYmludGVyZmFjZTsNCiAgICAgaW50IGJ1czsN CiAgICAgaW50IHVuaXQ7DQogfSBEcml2ZUluZm87DQpAQCAtMTM0LDggKzEzNCw4IEBADQogaW50 IG5iX2RyaXZlczsNCiBEcml2ZUluZm8gZHJpdmVzX3RhYmxlW01BWF9EUklWRVMrMV07DQogDQot ZXh0ZXJuIGludCBkcml2ZV9nZXRfaW5kZXgoQmxvY2tJbnRlcmZhY2VUeXBlIGludGVyZmFjZSwg aW50IGJ1cywgaW50IHVuaXQpOw0KLWV4dGVybiBpbnQgZHJpdmVfZ2V0X21heF9idXMoQmxvY2tJ bnRlcmZhY2VUeXBlIGludGVyZmFjZSk7DQorZXh0ZXJuIGludCBkcml2ZV9nZXRfaW5kZXgoQmxv Y2tJbnRlcmZhY2VUeXBlIGJpbnRlcmZhY2UsIGludCBidXMsIGludCB1bml0KTsNCitleHRlcm4g aW50IGRyaXZlX2dldF9tYXhfYnVzKEJsb2NrSW50ZXJmYWNlVHlwZSBiaW50ZXJmYWNlKTsNCiAN CiAvKiBzZXJpYWwgcG9ydHMgKi8NCiANCg0KKioqIHZsLmMNCi0tLSB2bC5jDQotLS0gdmwuYwkx MCBEZWMgMjAwNyAyMDowMDoxMCAtMDAwMAkxLjM3OA0KKysrIHZsLmMJMTIgRGVjIDIwMDcgMTk6 MTc6MDkgLTAwMDANCkBAIC00ODExLDE0ICs0ODExLDE0IEBADQogICAgIHJldHVybiBuYl9kcml2 ZXNfb3B0Kys7DQogfQ0KIA0KLWludCBkcml2ZV9nZXRfaW5kZXgoQmxvY2tJbnRlcmZhY2VUeXBl IGludGVyZmFjZSwgaW50IGJ1cywgaW50IHVuaXQpDQoraW50IGRyaXZlX2dldF9pbmRleChCbG9j a0ludGVyZmFjZVR5cGUgYmludGVyZmFjZSwgaW50IGJ1cywgaW50IHVuaXQpDQogew0KICAgICBp bnQgaW5kZXg7DQogDQogICAgIC8qIHNlZWsgaW50ZXJmYWNlLCBidXMgYW5kIHVuaXQgKi8NCiAN CiAgICAgZm9yIChpbmRleCA9IDA7IGluZGV4IDwgbmJfZHJpdmVzOyBpbmRleCsrKQ0KLSAgICAg ICAgaWYgKGRyaXZlc190YWJsZVtpbmRleF0uaW50ZXJmYWNlID09IGludGVyZmFjZSAmJg0KKyAg ICAgICAgaWYgKGRyaXZlc190YWJsZVtpbmRleF0uYmludGVyZmFjZSA9PSBiaW50ZXJmYWNlICYm DQogCSAgICBkcml2ZXNfdGFibGVbaW5kZXhdLmJ1cyA9PSBidXMgJiYNCiAJICAgIGRyaXZlc190 YWJsZVtpbmRleF0udW5pdCA9PSB1bml0KQ0KICAgICAgICAgcmV0dXJuIGluZGV4Ow0KQEAgLTQ4 MjYsMTQgKzQ4MjYsMTQgQEANCiAgICAgcmV0dXJuIC0xOw0KIH0NCiANCi1pbnQgZHJpdmVfZ2V0 X21heF9idXMoQmxvY2tJbnRlcmZhY2VUeXBlIGludGVyZmFjZSkNCitpbnQgZHJpdmVfZ2V0X21h eF9idXMoQmxvY2tJbnRlcmZhY2VUeXBlIGJpbnRlcmZhY2UpDQogew0KICAgICBpbnQgbWF4X2J1 czsNCiAgICAgaW50IGluZGV4Ow0KIA0KICAgICBtYXhfYnVzID0gLTE7DQogICAgIGZvciAoaW5k ZXggPSAwOyBpbmRleCA8IG5iX2RyaXZlczsgaW5kZXgrKykgew0KLSAgICAgICAgaWYoZHJpdmVz X3RhYmxlW2luZGV4XS5pbnRlcmZhY2UgPT0gaW50ZXJmYWNlICYmDQorICAgICAgICBpZihkcml2 ZXNfdGFibGVbaW5kZXhdLmJpbnRlcmZhY2UgPT0gYmludGVyZmFjZSAmJg0KICAgICAgICAgICAg ZHJpdmVzX3RhYmxlW2luZGV4XS5idXMgPiBtYXhfYnVzKQ0KICAgICAgICAgICAgIG1heF9idXMg PSBkcml2ZXNfdGFibGVbaW5kZXhdLmJ1czsNCiAgICAgfQ0KQEAgLTQ4NDYsNyArNDg0Niw3IEBA DQogICAgIGNoYXIgZmlsZVsxMDI0XTsNCiAgICAgY2hhciBkZXZuYW1lWzEyOF07DQogICAgIGNv bnN0IGNoYXIgKm1lZGlhc3RyID0gIiI7DQotICAgIEJsb2NrSW50ZXJmYWNlVHlwZSBpbnRlcmZh Y2U7DQorICAgIEJsb2NrSW50ZXJmYWNlVHlwZSBiaW50ZXJmYWNlOw0KICAgICBlbnVtIHsgTUVE SUFfRElTSywgTUVESUFfQ0RST00gfSBtZWRpYTsNCiAgICAgaW50IGJ1c19pZCwgdW5pdF9pZDsN CiAgICAgaW50IGN5bHMsIGhlYWRzLCBzZWNzLCB0cmFuc2xhdGlvbjsNCkBAIC00ODc1LDExICs0 ODc1LDExIEBADQogICAgICAgICAhc3RyY21wKG1hY2hpbmUtPm5hbWUsICJTUy02MDBNUCIpIHx8 DQogICAgICAgICAhc3RyY21wKG1hY2hpbmUtPm5hbWUsICJ2ZXJzYXRpbGVwYiIpIHx8DQogICAg ICAgICAhc3RyY21wKG1hY2hpbmUtPm5hbWUsICJ2ZXJzYXRpbGVhYiIpKSB7DQotICAgICAgICBp bnRlcmZhY2UgPSBJRl9TQ1NJOw0KKyAgICAgICAgYmludGVyZmFjZSA9IElGX1NDU0k7DQogICAg ICAgICBtYXhfZGV2cyA9IE1BWF9TQ1NJX0RFVlM7DQogICAgICAgICBzdHJjcHkoZGV2bmFtZSwg InNjc2kiKTsNCiAgICAgfSBlbHNlIHsNCi0gICAgICAgIGludGVyZmFjZSA9IElGX0lERTsNCisg ICAgICAgIGJpbnRlcmZhY2UgPSBJRl9JREU7DQogICAgICAgICBtYXhfZGV2cyA9IE1BWF9JREVf REVWUzsNCiAgICAgICAgIHN0cmNweShkZXZuYW1lLCAiaWRlIik7DQogICAgIH0NCkBAIC00OTA2 LDIyICs0OTA2LDIyIEBADQogICAgIGlmIChnZXRfcGFyYW1fdmFsdWUoYnVmLCBzaXplb2YoYnVm KSwgImlmIiwgc3RyKSkgew0KICAgICAgICAgc3RybmNweShkZXZuYW1lLCBidWYsIHNpemVvZihk ZXZuYW1lKSk7DQogICAgICAgICBpZiAoIXN0cmNtcChidWYsICJpZGUiKSkgew0KLQkgICAgaW50 ZXJmYWNlID0gSUZfSURFOw0KKwkgICAgYmludGVyZmFjZSA9IElGX0lERTsNCiAgICAgICAgICAg ICBtYXhfZGV2cyA9IE1BWF9JREVfREVWUzsNCiAgICAgICAgIH0gZWxzZSBpZiAoIXN0cmNtcChi dWYsICJzY3NpIikpIHsNCi0JICAgIGludGVyZmFjZSA9IElGX1NDU0k7DQorCSAgICBiaW50ZXJm YWNlID0gSUZfU0NTSTsNCiAgICAgICAgICAgICBtYXhfZGV2cyA9IE1BWF9TQ1NJX0RFVlM7DQog ICAgICAgICB9IGVsc2UgaWYgKCFzdHJjbXAoYnVmLCAiZmxvcHB5IikpIHsNCi0JICAgIGludGVy ZmFjZSA9IElGX0ZMT1BQWTsNCisJICAgIGJpbnRlcmZhY2UgPSBJRl9GTE9QUFk7DQogICAgICAg ICAgICAgbWF4X2RldnMgPSAwOw0KICAgICAgICAgfSBlbHNlIGlmICghc3RyY21wKGJ1ZiwgInBm bGFzaCIpKSB7DQotCSAgICBpbnRlcmZhY2UgPSBJRl9QRkxBU0g7DQorCSAgICBiaW50ZXJmYWNl ID0gSUZfUEZMQVNIOw0KICAgICAgICAgICAgIG1heF9kZXZzID0gMDsNCiAJfSBlbHNlIGlmICgh c3RyY21wKGJ1ZiwgIm10ZCIpKSB7DQotCSAgICBpbnRlcmZhY2UgPSBJRl9NVEQ7DQorCSAgICBi aW50ZXJmYWNlID0gSUZfTVREOw0KICAgICAgICAgICAgIG1heF9kZXZzID0gMDsNCiAJfSBlbHNl IGlmICghc3RyY21wKGJ1ZiwgInNkIikpIHsNCi0JICAgIGludGVyZmFjZSA9IElGX1NEOw0KKwkg ICAgYmludGVyZmFjZSA9IElGX1NEOw0KICAgICAgICAgICAgIG1heF9kZXZzID0gMDsNCiAJfSBl bHNlIHsNCiAgICAgICAgICAgICBmcHJpbnRmKHN0ZGVyciwgInFlbXU6ICclcycgdW5zdXBwb3J0 ZWQgYnVzIHR5cGUgJyVzJ1xuIiwgc3RyLCBidWYpOw0KQEAgLTUwMzYsNyArNTAzNiw3IEBADQog DQogICAgIGlmICh1bml0X2lkID09IC0xKSB7DQogICAgICAgIHVuaXRfaWQgPSAwOw0KLSAgICAg ICB3aGlsZSAoZHJpdmVfZ2V0X2luZGV4KGludGVyZmFjZSwgYnVzX2lkLCB1bml0X2lkKSAhPSAt MSkgew0KKyAgICAgICB3aGlsZSAoZHJpdmVfZ2V0X2luZGV4KGJpbnRlcmZhY2UsIGJ1c19pZCwg dW5pdF9pZCkgIT0gLTEpIHsNCiAgICAgICAgICAgIHVuaXRfaWQrKzsNCiAgICAgICAgICAgIGlm IChtYXhfZGV2cyAmJiB1bml0X2lkID49IG1heF9kZXZzKSB7DQogICAgICAgICAgICAgICAgdW5p dF9pZCAtPSBtYXhfZGV2czsNCkBAIC01MDU3LDIzICs1MDU3LDIzIEBADQogICAgICAqIGlnbm9y ZSBtdWx0aXBsZSBkZWZpbml0aW9ucw0KICAgICAgKi8NCiANCi0gICAgaWYgKGRyaXZlX2dldF9p bmRleChpbnRlcmZhY2UsIGJ1c19pZCwgdW5pdF9pZCkgIT0gLTEpDQorICAgIGlmIChkcml2ZV9n ZXRfaW5kZXgoYmludGVyZmFjZSwgYnVzX2lkLCB1bml0X2lkKSAhPSAtMSkNCiAgICAgICAgIHJl dHVybiAwOw0KIA0KICAgICAvKiBpbml0ICovDQogDQotICAgIGlmIChpbnRlcmZhY2UgPT0gSUZf SURFIHx8IGludGVyZmFjZSA9PSBJRl9TQ1NJKQ0KKyAgICBpZiAoYmludGVyZmFjZSA9PSBJRl9J REUgfHwgYmludGVyZmFjZSA9PSBJRl9TQ1NJKQ0KICAgICAgICAgbWVkaWFzdHIgPSAobWVkaWEg PT0gTUVESUFfQ0RST00pID8gIi1jZCIgOiAiLWhkIjsNCiAgICAgc25wcmludGYoYnVmLCBzaXpl b2YoYnVmKSwgbWF4X2RldnMgPyAiJTEkcyU0JGklMiRzJTMkaSIgOiAiJXMlcyVpIiwNCiAgICAg ICAgICAgICAgZGV2bmFtZSwgbWVkaWFzdHIsIHVuaXRfaWQsIGJ1c19pZCk7DQogICAgIGJkcnYg PSBiZHJ2X25ldyhidWYpOw0KICAgICBkcml2ZXNfdGFibGVbbmJfZHJpdmVzXS5iZHJ2ID0gYmRy djsNCi0gICAgZHJpdmVzX3RhYmxlW25iX2RyaXZlc10uaW50ZXJmYWNlID0gaW50ZXJmYWNlOw0K KyAgICBkcml2ZXNfdGFibGVbbmJfZHJpdmVzXS5iaW50ZXJmYWNlID0gYmludGVyZmFjZTsNCiAg ICAgZHJpdmVzX3RhYmxlW25iX2RyaXZlc10uYnVzID0gYnVzX2lkOw0KICAgICBkcml2ZXNfdGFi bGVbbmJfZHJpdmVzXS51bml0ID0gdW5pdF9pZDsNCiAgICAgbmJfZHJpdmVzKys7DQogDQotICAg IHN3aXRjaChpbnRlcmZhY2UpIHsNCisgICAgc3dpdGNoKGJpbnRlcmZhY2UpIHsNCiAgICAgY2Fz ZSBJRl9JREU6DQogICAgIGNhc2UgSUZfU0NTSToNCiAgICAgICAgIHN3aXRjaChtZWRpYSkgew0K DQo= ------=_Part_7211_12497944.1197489049114--