From 5b2bbf37fa2f90ac1b6ab381179d739ae376723b Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Wed, 16 May 2012 18:22:27 +0000 Subject: [PATCH] s2_clnt.c: compensate for compiler bug [from HEAD]. --- ssl/s2_clnt.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/ssl/s2_clnt.c b/ssl/s2_clnt.c index 00ac158f9b..76b690ea13 100644 --- a/ssl/s2_clnt.c +++ b/ssl/s2_clnt.c @@ -359,12 +359,14 @@ static int get_server_hello(SSL *s) SSL_R_PEER_ERROR); return(-1); } -#ifdef __APPLE_CC__ - /* The Rhapsody 5.5 (a.k.a. MacOS X) compiler bug - * workaround. */ - s->hit=(i=*(p++))?1:0; -#else +#if 0 s->hit=(*(p++))?1:0; + /* Some [PPC?] compilers fail to increment p in above + statement, e.g. one provided with Rhapsody 5.5, but + most recent example XL C 11.1 for AIX, even without + optimization flag... */ +#else + s->hit=(*p)?1:0; p++; #endif s->s2->tmp.cert_type= *(p++); n2s(p,i); -- 2.34.1