diff options
| author | Andy Polyakov <appro@openssl.org> | 2012-05-16 18:22:27 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2012-05-16 18:22:27 +0000 |
| commit | 5b2bbf37fa2f90ac1b6ab381179d739ae376723b (patch) | |
| tree | d3c448654ddace147d9a5a98e7a3a95f69a0bb4a /ssl/s2_clnt.c | |
| parent | 6321ac9e15b23fdcbad25299ca4456a8186f6403 (diff) | |
s2_clnt.c: compensate for compiler bug [from HEAD].
Diffstat (limited to 'ssl/s2_clnt.c')
| -rw-r--r-- | ssl/s2_clnt.c | 12 |
1 files 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. <appro@fy.chalmers.se> */ - 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); |