From: Ulf Möller <ulf@openssl.org>
Date: Fri, 4 Jun 1999 13:41:30 +0000 (+0000)
Subject: Avoid type conflict on Unix with DEC C.
X-Git-Tag: OpenSSL_0_9_4~258
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=1e44804e3308e9a40b882e09e87d0f241b7d55ca;p=oweals%2Fopenssl.git

Avoid type conflict on Unix with DEC C.

Pointed out by Sergio Rabellino <Rabellino@di.unito.it>
---

diff --git a/apps/s_client.c b/apps/s_client.c
index 1fa157573a..81617afb2a 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -60,7 +60,7 @@
    recursive header file inclusion, resulting in the compiler complaining
    that u_int isn't defined, but only if _POSIX_C_SOURCE is defined, which
    is needed to have fileno() declared correctly...  So let's define u_int */
-#if defined(__DECC) && !defined(__U_INT)
+#if defined(VMS) && defined(__DECC) && !defined(__U_INT)
 #define __U_INT
 typedef unsigned int u_int;
 #endif
diff --git a/apps/s_server.c b/apps/s_server.c
index 2341949517..0a25d8cb03 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -60,7 +60,7 @@
    recursive header file inclusion, resulting in the compiler complaining
    that u_int isn't defined, but only if _POSIX_C_SOURCE is defined, which
    is needed to have fileno() declared correctly...  So let's define u_int */
-#if defined(__DECC) && !defined(__U_INT)
+#if defined(VMS) && defined(__DECC) && !defined(__U_INT)
 #define __U_INT
 typedef unsigned int u_int;
 #endif
diff --git a/apps/s_socket.c b/apps/s_socket.c
index 99a94633aa..6302f9f934 100644
--- a/apps/s_socket.c
+++ b/apps/s_socket.c
@@ -60,7 +60,7 @@
    recursive header file inclusion, resulting in the compiler complaining
    that u_int isn't defined, but only if _POSIX_C_SOURCE is defined, which
    is needed to have fileno() declared correctly...  So let's define u_int */
-#if defined(__DECC) && !defined(__U_INT)
+#if defined(VMS) && defined(__DECC) && !defined(__U_INT)
 #define __U_INT
 typedef unsigned int u_int;
 #endif