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 1fa157573a743751cf32436754652b8bc9f7f8d3..81617afb2a5bd4e1c2070b65a6df547eaf03b473 100644 (file)
--- 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 23419495171c2381ace2891c03524d4251315604..0a25d8cb0359a2d68fbbc520f29ba6a721404a7d 100644 (file)
--- 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 99a94633aad9fce140f7b8d65ce5507c50a9b3e7..6302f9f934ce043317de43845d2357a0be3de497 100644 (file)
--- 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