Rhapsody 5.5 (a.k.a. MacOS X) compiler bug workaround. At the very least

passes 'make test' now:-)

diff --git a/ssl/s2_clnt.c b/ssl/s2_clnt.c
index 956c0280c99b24c0dde1632fec6d31726d3a1890..d047e89ed6e5dc5b06fa4b6ba12a957101b96814 100644 (file)
--- a/ssl/s2_clnt.c
+++ b/ssl/s2_clnt.c
@@ -310,7 +310,13 @@ 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
                s->hit=(*(p++))?1:0;
+#endif
                s->s2->tmp.cert_type= *(p++);
                n2s(p,i);
                if (i < s->version) s->version=i;