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 79735126fc90723de4a2df6875f4ebd09c864c2a..abf214ad7f9b4d2a7f324c4e68f3d1ec8c9cc711 100644 (file)
--- 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>