/pidgin/main: 7cb860a7bb2e: libpidgin: Fix Win32 build due to la...
Mike Ruprecht <[email protected]> Wed, 28 Sep 2016 10:32:40 -0400
| Newsgroups | gmane.comp.gnome.gaim.cvs |
|---|---|
| Message-ID | <[email protected]> |
Q2hhbmdlc2V0OiA3Y2I4NjBhN2JiMmU5ZjBlMTg3YTlmOTkxNTcxMmMwZDdlYTczODU2CkF1dGhv cjoJIE1pa2UgUnVwcmVjaHQgPGNtYWlrdUBnbWFpbC5jb20+CkRhdGU6CSAyMDE2LTA5LTIyIDE0 OjAwIC0wNTAwCkJyYW5jaDoJIGRlZmF1bHQKVVJMOiBodHRwczovL2hnLnBpZGdpbi5pbS9waWRn aW4vbWFpbi9yZXYvN2NiODYwYTdiYjJlCgpEZXNjcmlwdGlvbjoKCmxpYnBpZGdpbjogRml4IFdp bjMyIGJ1aWxkIGR1ZSB0byBsYWNraW5nIHNpZ25hbHBhaXIoKSBhbmQgc29tZSBlbnVtcwoKV2lu MzIgbGFja3MgdGhlIHNpZ25hbHBhaXIoKSBmdW5jdGlvbiBhbmQgc29tZSBlbnVtcyBsaWtlIFNJ R1FVSVQuClRoaXMgcGF0Y2ggcmVtb3ZlcyBzaWduYWwgaGFuZGxpbmcgY2FwYWJpbGl0eSBmcm9t IFdpbjMyIHVudGlsIGFuCmFwcHJvcHJpYXRlIGFsdGVybmF0aXZlIHRvIHNpZ25hbHBhaXIoKSBj YW4gYmUgaW1wbGVtZW50ZWQuIFdoaWNoCm1heSB2ZXJ5IHdlbGwgYmUgbWFraW5nIGEgc2lnbmFs cGFpcigpIGNvbXBhdCBmdW5jdGlvbi4KCmRpZmZzdGF0OgoKIHBpZGdpbi9saWJwaWRnaW4uYyB8 ICAyNyArKysrKysrKysrKysrKysrKysrKysrKysrKy0KIDEgZmlsZXMgY2hhbmdlZCwgMjYgaW5z ZXJ0aW9ucygrKSwgMSBkZWxldGlvbnMoLSkKCmRpZmZzICgxNTUgbGluZXMpOgoKZGlmZiAtLWdp dCBhL3BpZGdpbi9saWJwaWRnaW4uYyBiL3BpZGdpbi9saWJwaWRnaW4uYwotLS0gYS9waWRnaW4v bGlicGlkZ2luLmMKKysrIGIvcGlkZ2luL2xpYnBpZGdpbi5jCkBAIC03MCwxMCArNzAsMTMgQEAK ICNpbmNsdWRlICJwaWRnaW5zdG9jay5oIgogI2luY2x1ZGUgImd0a3doaXRlYm9hcmQuaCIKIAor I2lmbmRlZiBfV0lOMzIKICNpbmNsdWRlIDxzaWduYWwuaD4KKyNlbmRpZgogCiAjaW5jbHVkZSA8 Z2V0b3B0Lmg+CiAKKyNpZm5kZWYgX1dJTjMyCiAKIC8qCiAgKiBMaXN0cyBvZiBzaWduYWxzIHdl IHdpc2ggdG8gY2F0Y2ggYW5kIHRob3NlIHdlIHdpc2ggdG8gaWdub3JlLgpAQCAtOTIsNiArOTUs NyBAQCBzdGF0aWMgY29uc3QgaW50IGlnbm9yZV9zaWdfbGlzdFtdID0gewogCVNJR1BJUEUsCiAJ LTEKIH07CisjZW5kaWYgLyogIV9XSU4zMiAqLwogCiBzdGF0aWMgdm9pZAogZG9sb2dpbl9uYW1l ZChjb25zdCBjaGFyICpuYW1lKQpAQCAtMTIxLDYgKzEyNSw3IEBAIGRvbG9naW5fbmFtZWQoY29u c3QgY2hhciAqbmFtZSkKIAl9CiB9CiAKKyNpZm5kZWYgX1dJTjMyCiBzdGF0aWMgY2hhciAqc2Vn ZmF1bHRfbWVzc2FnZTsKIAogc3RhdGljIGludCBzaWduYWxfc29ja2V0c1syXTsKQEAgLTE4OSw2 ICsxOTQsNyBAQCBtYWlubG9vcF9zaWdoYW5kbGVyKEdJT0NoYW5uZWwgKnNvdXJjZSwgCiAKIAly ZXR1cm4gVFJVRTsKIH0KKyNlbmRpZiAvKiAhX1dJTjMyICovCiAKIHN0YXRpYyBpbnQKIHVpX21h aW4odm9pZCkKQEAgLTQyNywyMSArNDMzLDIzIEBAIGludCBwaWRnaW5fc3RhcnQoaW50IGFyZ2Ms IGNoYXIgKmFyZ3ZbXSkKIAlHdGtDc3NQcm92aWRlciAqcHJvdmlkZXI7CiAJR2RrU2NyZWVuICpz Y3JlZW47CiAJR0xpc3QgKmFjY291bnRzOworI2lmbmRlZiBfV0lOMzIKIAlpbnQgc2lnX2luZHg7 CS8qIGZvciBzZXR0aW5nIHVwIHNpZ25hbCBjYXRjaGluZyAqLwogCXNpZ3NldF90IHNpZ3NldDsK IAljaGFyIGVycm1zZ1tCVUZTSVpdOwogCUdJT0NoYW5uZWwgKnNpZ25hbF9jaGFubmVsOwogCUdJ T1N0YXR1cyBzaWduYWxfc3RhdHVzOwogCWd1aW50IHNpZ25hbF9jaGFubmVsX3dhdGNoZXI7Ci0J R0Vycm9yICplcnJvcjsKICNpZm5kZWYgREVCVUcKIAljaGFyICpzZWdmYXVsdF9tZXNzYWdlX3Rt cDsKICNlbmRpZiAvKiBERUJVRyAqLworI2VuZGlmIC8qICFfV0lOMzIgKi8KIAlpbnQgb3B0Owog CWdib29sZWFuIGd1aV9jaGVjazsKIAlnYm9vbGVhbiBkZWJ1Z19lbmFibGVkLCBkZWJ1Z19jb2xv cmVkOwogCUdMaXN0ICphY3RpdmVfYWNjb3VudHM7CiAJR1N0YXRCdWYgc3Q7CisJR0Vycm9yICpl cnJvcjsKIAogCXN0cnVjdCBvcHRpb24gbG9uZ19vcHRpb25zW10gPSB7CiAJCXsiY29uZmlnIiwg ICAgICAgcmVxdWlyZWRfYXJndW1lbnQsIE5VTEwsICdjJ30sCkBAIC00NzQsNiArNDgyLDggQEAg aW50IHBpZGdpbl9zdGFydChpbnQgYXJnYywgY2hhciAqYXJndltdKQogCS8qIExvY2FsZSBpbml0 aWFsaXphdGlvbiBpcyBub3QgY29tcGxldGUgaGVyZS4gIFNlZSBndGtfaW5pdF9jaGVjaygpICov CiAJc2V0bG9jYWxlKExDX0FMTCwgIiIpOwogCisjaWZuZGVmIF9XSU4zMgorCiAjaWZuZGVmIERF QlVHCiAJCS8qIFdlIHRyYW5zbGF0ZSB0aGlzIGhlcmUgaW4gY2FzZSB0aGUgY3Jhc2ggYnJlYWtz IGdldHRleHQuICovCiAJCXNlZ2ZhdWx0X21lc3NhZ2VfdG1wID0gZ19zdHJkdXBfcHJpbnRmKF8o CkBAIC01NzQsNiArNTg0LDcgQEAgaW50IHBpZGdpbl9zdGFydChpbnQgYXJnYywgY2hhciAqYXJn dltdKQogCQlzbnByaW50ZihlcnJtc2csIHNpemVvZihlcnJtc2cpLCAiV2FybmluZzogY291bGRu J3QgdW5ibG9jayBzaWduYWxzIik7CiAJCXBlcnJvcihlcnJtc2cpOwogCX0KKyNlbmRpZiAvKiAh X1dJTjMyICovCiAKIAkvKiBzY2FuIGNvbW1hbmQtbGluZSBvcHRpb25zICovCiAJb3B0ZXJyID0g MTsKQEAgLTYyNiw3ICs2MzcsOSBAQCBpbnQgcGlkZ2luX3N0YXJ0KGludCBhcmdjLCBjaGFyICph cmd2W10pCiAJCWNhc2UgJz8nOgkvKiBzaG93IHRlcnNlIGhlbHAgKi8KIAkJZGVmYXVsdDoKIAkJ CXNob3dfdXNhZ2UoYXJndlswXSwgVFJVRSk7CisjaWZuZGVmIF9XSU4zMgogCQkJZ19mcmVlKHNl Z2ZhdWx0X21lc3NhZ2UpOworI2VuZGlmCiAJCQlyZXR1cm4gMDsKIAkJCWJyZWFrOwogCQl9CkBA IC02MzUsMTQgKzY0OCwxOCBAQCBpbnQgcGlkZ2luX3N0YXJ0KGludCBhcmdjLCBjaGFyICphcmd2 W10pCiAJLyogc2hvdyBoZWxwIG1lc3NhZ2UgKi8KIAlpZiAob3B0X2hlbHApIHsKIAkJc2hvd191 c2FnZShhcmd2WzBdLCBGQUxTRSk7CisjaWZuZGVmIF9XSU4zMgogCQlnX2ZyZWUoc2VnZmF1bHRf bWVzc2FnZSk7CisjZW5kaWYKIAkJcmV0dXJuIDA7CiAJfQogCS8qIHNob3cgdmVyc2lvbiBtZXNz YWdlICovCiAJaWYgKG9wdF92ZXJzaW9uKSB7CiAJCXByaW50ZigiJXMgJXMgKGxpYnB1cnBsZSAl cylcbiIsIFBJREdJTl9OQU1FLCBESVNQTEFZX1ZFUlNJT04sCiAJCSAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIHB1cnBsZV9jb3JlX2dldF92ZXJzaW9uKCkpOworI2lmbmRlZiBfV0lO MzIKIAkJZ19mcmVlKHNlZ2ZhdWx0X21lc3NhZ2UpOworI2VuZGlmCiAJCXJldHVybiAwOwogCX0K IApAQCAtNjc3LDcgKzY5NCw5IEBAIGludCBwaWRnaW5fc3RhcnQoaW50IGFyZ2MsIGNoYXIgKmFy Z3ZbXSkKIAkJcHJpbnRmKCIlcyAlc1xuIiwgUElER0lOX05BTUUsIERJU1BMQVlfVkVSU0lPTik7 CiAKIAkJZ193YXJuaW5nKCJjYW5ub3Qgb3BlbiBkaXNwbGF5OiAlcyIsIGRpc3BsYXkgPyBkaXNw bGF5IDogInVuc2V0Iik7CisjaWZuZGVmIF9XSU4zMgogCQlnX2ZyZWUoc2VnZmF1bHRfbWVzc2Fn ZSk7CisjZW5kaWYKIAogCQlyZXR1cm4gMTsKIAl9CkBAIC03MTEsNyArNzMwLDkgQEAgaW50IHBp ZGdpbl9zdGFydChpbnQgYXJnYywgY2hhciAqYXJndltdKQogCQlmcHJpbnRmKHN0ZGVyciwKIAkJ CQkiSW5pdGlhbGl6YXRpb24gb2YgdGhlIGxpYnB1cnBsZSBjb3JlIGZhaWxlZC4gRHVtcGluZyBj b3JlLlxuIgogCQkJCSJQbGVhc2UgcmVwb3J0IHRoaXMhXG4iKTsKKyNpZm5kZWYgX1dJTjMyCiAJ CWdfZnJlZShzZWdmYXVsdF9tZXNzYWdlKTsKKyNlbmRpZgogCQlhYm9ydCgpOwogCX0KIApAQCAt NzM3LDcgKzc1OCw5IEBAIGludCBwaWRnaW5fc3RhcnQoaW50IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkK IAkJZ2RrX25vdGlmeV9zdGFydHVwX2NvbXBsZXRlKCk7CiAJCXB1cnBsZV9jb3JlX3F1aXQoKTsK IAkJZ19wcmludGVycihfKCJFeGl0aW5nIGJlY2F1c2UgYW5vdGhlciBsaWJwdXJwbGUgY2xpZW50 IGlzIGFscmVhZHkgcnVubmluZy5cbiIpKTsKKyNpZm5kZWYgX1dJTjMyCiAJCWdfZnJlZShzZWdm YXVsdF9tZXNzYWdlKTsKKyNlbmRpZgogCQlyZXR1cm4gMDsKIAl9CiAKQEAgLTgyMiwxMCArODQ1 LDEyIEBAIGludCBwaWRnaW5fc3RhcnQoaW50IGFyZ2MsIGNoYXIgKmFyZ3ZbXSkKIAogCWd0a19t YWluKCk7CiAKKyNpZm5kZWYgX1dJTjMyCiAJZ19mcmVlKHNlZ2ZhdWx0X21lc3NhZ2UpOwogCWdf c291cmNlX3JlbW92ZShzaWduYWxfY2hhbm5lbF93YXRjaGVyKTsKIAljbG9zZShzaWduYWxfc29j a2V0c1swXSk7CiAJY2xvc2Uoc2lnbmFsX3NvY2tldHNbMV0pOworI2VuZGlmCiAKICNpZmRlZiBf V0lOMzIKIAl3aW5waWRnaW5fY2xlYW51cCgpOwoKX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX18KQ29tbWl0cyBtYWlsaW5nIGxpc3QKQ29tbWl0c0BwaWRnaW4u aW0KaHR0cHM6Ly9waWRnaW4uaW0vY2dpLWJpbi9tYWlsbWFuL2xpc3RpbmZvL2NvbW1pdHM=