From: Dr. Stephen Henson <steve@openssl.org>
Date: Sun, 24 Jan 2010 16:57:20 +0000 (+0000)
Subject: PR: 2153, 2125
X-Git-Tag: OpenSSL-fips-2_0-rc1~1322
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=bc120a54c9268ac37ede72aa88ed49ac6dbd4403;p=oweals%2Fopenssl.git

PR: 2153, 2125
Submitted by: steve@openssl.org

The original fix for PR#2125 broke compilation on some Unixware platforms:
revert and make conditional on VMS.
---

diff --git a/ssl/ssltest.c b/ssl/ssltest.c
index 79735126fc..abf214ad7f 100644
--- a/ssl/ssltest.c
+++ b/ssl/ssltest.c
@@ -143,9 +143,6 @@
 #define _BSD_SOURCE 1		/* Or gethostname won't be declared properly
 				   on Linux and GNU platforms. */
 
-#define _XOPEN_SOURCE 500	/* Or isascii won't be declared properly on
-				   VMS (at least with DECompHP C).  */
-
 #include <assert.h>
 #include <errno.h>
 #include <limits.h>
@@ -157,6 +154,11 @@
 #define USE_SOCKETS
 #include "e_os.h"
 
+#ifdef OPENSSL_SYS_VMS
+#define _XOPEN_SOURCE 500	/* Or isascii won't be declared properly on
+				   VMS (at least with DECompHP C).  */
+#endif
+
 #include <ctype.h>
 
 #include <openssl/bio.h>