X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=vms%2Fsockadapt.h;h=97a49f89177caa6a6a6a67ce1e62560a500cb3d7;hb=2c864a0811fbe4cad763045a119f93a241340a2f;hp=f24faea4750b03bcbab93e629694e56621ada570;hpb=d27fe803587dd19cb1812b267492c364c09580fa;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/vms/sockadapt.h b/vms/sockadapt.h
index f24faea..97a49f8 100644
--- 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
  *
@@ -24,6 +24,8 @@
 #  include <inet.h>
 #  include <in.h>
 #  include <netdb.h>
+#if ((__VMS_VER >= 70000000) && (__DECC_VER >= 50200000)) || (__CRTL_VER >= 70000000)
+#else
    void sethostent(int);
    void endhostent(void);
    void setnetent(int);
@@ -32,7 +34,8 @@
    void endprotoent(void);
    void setservent(int);
    void endservent(void);
-#  if defined(__DECC) && defined(__DECC_VER) && (__DECC_VER >= 50200000)
+#endif
+#  if defined(__DECC) && defined(__DECC_VER) && (__DECC_VER >= 50200000) && !defined(Sock_size_t)
 #    define Sock_size_t unsigned int
 #  endif
 
@@ -142,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
@@ -153,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. */
@@ -178,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 */