Re: [PATCH] Restore Windows (and NeXT and NetWare etc) build of test suite following revision 1124400

Steve Hay <[email protected]> Sun, 13 Jul 2014 14:35:27 +0100
Newsgroups gmane.comp.apache.apreq
Message-ID <CADED=K4W1E8eperxHzPH8upHzv_gapN-6Xgoo7QQym9+ojOBPQ@mail.gmail.com>
--001a11c20d025be4cd04fe133fe2
Content-Type: text/plain; charset=UTF-8

On 21 March 2014 22:17, Steve Hay <[email protected]> wrote:
> Testing a mod_perl & libapreq build on Windows I have come across a
> problem introduced into the current SVN trunk of libapreq by revision
> 1124400.
>
> The attached patch fixes the problem for me on Windows, and hopefully
> for any NeXT and NetWare users out there too, but it seems I don't
> have commit access to apreq. Please could somebody apply this (and
> even test the non-Windows cases first if possible too)?

The original patch fixed the build on Windows, but not quite as
intended: It used nothing for the definition of AT_INLINE, instead of
using __inline as I had intended. (The main thing is not to use inline
(or __inline__), which MS VC++ doesn't understand.)

The attached patch corrects that.

--001a11c20d025be4cd04fe133fe2
Content-Type: text/x-diff; charset=US-ASCII; name="inline2.patch"
Content-Disposition: attachment; filename="inline2.patch"
Content-Transfer-Encoding: base64
X-Attachment-Id: f_hxken3321

SW5kZXg6IGxpYnJhcnkvdC9hdC5oDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gbGlicmFyeS90L2F0LmgJKHJl
dmlzaW9uIDE2MTAxODIpDQorKysgbGlicmFyeS90L2F0LmgJKHdvcmtpbmcgY29weSkNCkBAIC03
Nyw4ICs3NywxNyBAQA0KIH07CiAKIAorI2lmIGRlZmluZWQoV0lOMzIpCisjZGVmaW5lIEFUX0lO
TElORSBfX2lubGluZQorI2VsaWYgIWRlZmluZWQoX19HTlVDX18pIHx8IF9fR05VQ19fIDwgMiB8
fCBcCisgICAgKF9fR05VQ19fID09IDIgJiYgX19HTlVDX01JTk9SX18gPCA3KSB8fFwKKyAgICBk
ZWZpbmVkKE5FWFQpIHx8IGRlZmluZWQoTkVUV0FSRSkKKyNkZWZpbmUgQVRfSU5MSU5FCisjZWxz
ZQorI2RlZmluZSBBVF9JTkxJTkUgX19pbmxpbmVfXworI2VuZGlmCiAKLXN0YXRpYyBpbmxpbmUK
K3N0YXRpYyBBVF9JTkxJTkUKIGludCBhdF9yZXBvcnQoYXRfdCAqdCwgY29uc3QgY2hhciAqbXNn
KSB7CiAgICAgYXRfcmVwb3J0X3QgKnIgPSB0LT5yZXBvcnQ7CiAgICAgcmV0dXJuIHItPmZ1bmMo
ciwgbXNnKTsKQEAgLTEyOSw3ICsxMzgsNyBAQA0KIAogaW50IGF0X2NvbW1lbnQoYXRfdCAqdCwg
Y29uc3QgY2hhciAqZm10LCB2YV9saXN0IHZwKTsKIAotc3RhdGljIGlubGluZQorc3RhdGljIEFU
X0lOTElORQogdm9pZCBhdF9kZWJ1ZyhhdF90ICp0LCBjb25zdCBjaGFyICpmbXQsIC4uLikgewog
ICAgIHZhX2xpc3QgdnA7CiAgICAgdmFfc3RhcnQodnAsIGZtdCk7CkBAIC0xMzgsNyArMTQ3LDcg
QEANCiAgICAgdmFfZW5kKHZwKTsKIH0KIAotc3RhdGljIGlubGluZQorc3RhdGljIEFUX0lOTElO
RQogdm9pZCBhdF90cmFjZShhdF90ICp0LCBjb25zdCBjaGFyICpmbXQsIC4uLikgewogICAgIHZh
X2xpc3QgdnA7CiAgICAgdmFfc3RhcnQodnAsIGZtdCk7CkBAIC0xNTAsNyArMTU5LDcgQEANCiAK
IC8qIFRoZXNlIGFyZSAiY2hlY2tzIi4gKi8KIAotc3RhdGljIGlubGluZQorc3RhdGljIEFUX0lO
TElORQogdm9pZCBhdF9jaGVjayhhdF90ICp0LCBpbnQgaXNfb2ssIGNvbnN0IGNoYXIgKmxhYmVs
LCBjb25zdCBjaGFyICpmaWxlLAogICAgICAgICAgICBpbnQgbGluZSwgY29uc3QgY2hhciAqZm10
LCAuLi4pCiB7CkBAIC0yNjgsNyArMjc3LDcgQEANCiAgICAgICAgICAgICAgICAgICAgICAgICAg
ICAgICAgICAgX19GSUxFX18sIF9fTElORV9fLCBmbXQsIGEsIGIpCiAKIAotc3RhdGljIGlubGlu
ZQorc3RhdGljIEFUX0lOTElORQogdm9pZCBhdF9za2lwKGF0X3QgKnQsIGludCBuLCBjb25zdCBj
aGFyICpyZWFzb24sIGNvbnN0IGNoYXIgKmZpbGUsIGludCBsaW5lKSB7CiAgICAgY2hhciBidWZb
MjU2XTsKICAgICB3aGlsZSAobi0tID4gMCkgewpAQCAtMjg1LDcgKzI5NCw3IEBADQogLyogUmVw
b3J0IHV0aWxpdGllcy4gKi8KIAogYXRfcmVwb3J0X3QgKmF0X3JlcG9ydF9maWxlX21ha2UoRklM
RSAqZik7Ci1pbmxpbmUKK0FUX0lOTElORQogc3RhdGljIGF0X3JlcG9ydF90ICphdF9yZXBvcnRf
c3Rkb3V0X21ha2Uodm9pZCkKIHsKICAgICByZXR1cm4gYXRfcmVwb3J0X2ZpbGVfbWFrZShzdGRv
dXQpOwo=
--001a11c20d025be4cd04fe133fe2--