More logical test ordering.

[perl5.git] / vms / sockadapt.h

diff --git a/vms/sockadapt.h b/vms/sockadapt.h
index 7f9150a..97a49f8 100644 (file)
--- a/vms/sockadapt.h
+++ b/vms/sockadapt.h
@@ -1,6 +1,6 @@
 /*  sockadapt.h
  *
- *  Authors: Charles Bailey  bailey@genetics.upenn.edu
+ *  Authors: Charles Bailey  bailey@newman.upenn.edu
  *           David Denholm  denholm@conmat.phys.soton.ac.uk
  *  Last Revised:  4-Mar-1997
  *
@@ -35,7 +35,7 @@
    void setservent(int);
    void endservent(void);
 #endif
-#  if defined(__DECC) && defined(__DECC_VER) && (__DECC_VER >= 50200000)
+#  if defined(__DECC) && defined(__DECC_VER) && (__DECC_VER >= 50200000) && !defined(Sock_size_t)
 #    define Sock_size_t unsigned int
 #  endif
 
@@ -145,7 +145,6 @@ void endnetent();
 #include <socket.h>
 #include <in.h>
 #include <inet.h>
-#include <netdb.h>
 
 /* SocketShr doesn't support these routines, but the DECC RTL contains
  * stubs with these names, designed to be used with the UCX socket
@@ -156,6 +155,8 @@ void endnetent();
 #define getnetent    no_getnetent
 #define setnetent    no_setnetent
 #define endnetent    no_endnetent
+
+#include <netdb.h>
 #endif
 
 /* We don't have these two in the system headers. */
@@ -181,7 +182,7 @@ int si_fileno(FILE *);
 #  undef getpeername
 #endif
 #define getpeername my_getpeername
-int my_getpeername _((int, struct sockaddr *, int *));
+int my_getpeername (int, struct sockaddr *, int *);
 
 #endif /* SOCKETSHR stuff */
 #endif /* include guard */