assorted little nits

[perl5.git] / win32 / win32sck.c

diff --git a/win32/win32sck.c b/win32/win32sck.c
index abc6334..93d501e 100644 (file)
--- a/win32/win32sck.c
+++ b/win32/win32sck.c
@@ -75,27 +75,15 @@ static struct servent* win32_savecopyservent(struct servent*d,
                                              struct servent*s,
                                              const char *proto);
 
-#ifdef USE_THREADS
-#ifdef USE_DECLSPEC_THREAD
-__declspec(thread) struct servent myservent;
-__declspec(thread) int init_socktype;
-#else
-#define myservent (thr->i.Wservent)
-#define init_socktype (thr->i.Winit_socktype)
-#endif
-#else
-static struct servent myservent;
-#endif
-
 static int wsock_started = 0;
 
 void
 start_sockets(void) 
 {
+    dTHXo;
     unsigned short version;
     WSADATA retdata;
     int ret;
-    dPERLOBJ;
 
     /*
      * initalize the winsock interface and insure that it is
@@ -117,16 +105,16 @@ set_socktype(void)
 #ifdef USE_SOCKETS_AS_HANDLES
 #ifdef USE_THREADS
     dTHX;
-    if(!init_socktype) {
+    if (!w32_init_socktype) {
 #endif
-    int iSockOpt = SO_SYNCHRONOUS_NONALERT;
-    /*
-     * Enable the use of sockets as filehandles
-     */
-    setsockopt(INVALID_SOCKET, SOL_SOCKET, SO_OPENTYPE,
-               (char *)&iSockOpt, sizeof(iSockOpt));
+       int iSockOpt = SO_SYNCHRONOUS_NONALERT;
+       /*
+        * Enable the use of sockets as filehandles
+        */
+       setsockopt(INVALID_SOCKET, SOL_SOCKET, SO_OPENTYPE,
+                   (char *)&iSockOpt, sizeof(iSockOpt));
 #ifdef USE_THREADS
-    init_socktype = 1;
+       w32_init_socktype = 1;
     }
 #endif
 #endif /* USE_SOCKETS_AS_HANDLES */
@@ -495,12 +483,12 @@ win32_getprotobynumber(int num)
 struct servent *
 win32_getservbyname(const char *name, const char *proto)
 {
+    dTHXo;    
     struct servent *r;
-    dTHX;    
 
     SOCKET_TEST(r = getservbyname(name, proto), NULL);
     if (r) {
-       r = win32_savecopyservent(&myservent, r, proto);
+       r = win32_savecopyservent(&w32_servent, r, proto);
     }
     return r;
 }
@@ -508,12 +496,12 @@ win32_getservbyname(const char *name, const char *proto)
 struct servent *
 win32_getservbyport(int port, const char *proto)
 {
+    dTHXo; 
     struct servent *r;
-    dTHX; 
 
     SOCKET_TEST(r = getservbyport(port, proto), NULL);
     if (r) {
-       r = win32_savecopyservent(&myservent, r, proto);
+       r = win32_savecopyservent(&w32_servent, r, proto);
     }
     return r;
 }
@@ -521,9 +509,9 @@ win32_getservbyport(int port, const char *proto)
 int
 win32_ioctl(int i, unsigned int u, char *data)
 {
+    dTHXo;
     u_long argp = (u_long)data;
     int retval;
-    dPERLOBJ;
 
     if (!wsock_started) {
        Perl_croak_nocontext("ioctl implemented only on sockets");
@@ -562,28 +550,28 @@ win32_inet_addr(const char FAR *cp)
 void
 win32_endhostent() 
 {
-    dPERLOBJ;
+    dTHXo;
     Perl_croak_nocontext("endhostent not implemented!\n");
 }
 
 void
 win32_endnetent()
 {
-    dPERLOBJ;
+    dTHXo;
     Perl_croak_nocontext("endnetent not implemented!\n");
 }
 
 void
 win32_endprotoent()
 {
-    dPERLOBJ;
+    dTHXo;
     Perl_croak_nocontext("endprotoent not implemented!\n");
 }
 
 void
 win32_endservent()
 {
-    dPERLOBJ;
+    dTHXo;
     Perl_croak_nocontext("endservent not implemented!\n");
 }
 
@@ -591,7 +579,7 @@ win32_endservent()
 struct netent *
 win32_getnetent(void) 
 {
-    dPERLOBJ;
+    dTHXo;
     Perl_croak_nocontext("getnetent not implemented!\n");
     return (struct netent *) NULL;
 }
@@ -599,7 +587,7 @@ win32_getnetent(void)
 struct netent *
 win32_getnetbyname(char *name) 
 {
-    dPERLOBJ;
+    dTHXo;
     Perl_croak_nocontext("getnetbyname not implemented!\n");
     return (struct netent *)NULL;
 }
@@ -607,7 +595,7 @@ win32_getnetbyname(char *name)
 struct netent *
 win32_getnetbyaddr(long net, int type) 
 {
-    dPERLOBJ;
+    dTHXo;
     Perl_croak_nocontext("getnetbyaddr not implemented!\n");
     return (struct netent *)NULL;
 }
@@ -615,7 +603,7 @@ win32_getnetbyaddr(long net, int type)
 struct protoent *
 win32_getprotoent(void) 
 {
-    dPERLOBJ;
+    dTHXo;
     Perl_croak_nocontext("getprotoent not implemented!\n");
     return (struct protoent *) NULL;
 }
@@ -623,7 +611,7 @@ win32_getprotoent(void)
 struct servent *
 win32_getservent(void) 
 {
-    dPERLOBJ;
+    dTHXo;
     Perl_croak_nocontext("getservent not implemented!\n");
     return (struct servent *) NULL;
 }
@@ -631,7 +619,7 @@ win32_getservent(void)
 void
 win32_sethostent(int stayopen)
 {
-    dPERLOBJ;
+    dTHXo;
     Perl_croak_nocontext("sethostent not implemented!\n");
 }
 
@@ -639,7 +627,7 @@ win32_sethostent(int stayopen)
 void
 win32_setnetent(int stayopen)
 {
-    dPERLOBJ;
+    dTHXo;
     Perl_croak_nocontext("setnetent not implemented!\n");
 }
 
@@ -647,7 +635,7 @@ win32_setnetent(int stayopen)
 void
 win32_setprotoent(int stayopen)
 {
-    dPERLOBJ;
+    dTHXo;
     Perl_croak_nocontext("setprotoent not implemented!\n");
 }
 
@@ -655,7 +643,7 @@ win32_setprotoent(int stayopen)
 void
 win32_setservent(int stayopen)
 {
-    dPERLOBJ;
+    dTHXo;
     Perl_croak_nocontext("setservent not implemented!\n");
 }