somewhat untested PERL_OBJECT cleanups (C++isms mostly

gone from the public API); PERL_OBJECT builds again on
windows

TODO: namespace-clean the typedefs in iperlsys.h and
elsewhere; remove C++ remnants from public headers

p4raw-id: //depot/perl@3553

1 files changed, 15 insertions, 1 deletions

diff --git a/win32/win32sck.c b/win32/win32sck.c
index 8bd6b6cfd5..abc6334d72 100644
--- a/win32/win32sck.c
+++ b/win32/win32sck.c
@@ -20,7 +20,6 @@
 
 #if defined(PERL_OBJECT)
 #define NO_XSLOCKS
-extern CPerlObj* pPerl;
 #include "XSUB.h"
 #endif
 
@@ -96,6 +95,7 @@ start_sockets(void)
     unsigned short version;
     WSADATA retdata;
     int ret;
+    dPERLOBJ;
 
     /*
      * initalize the winsock interface and insure that it is
@@ -523,6 +523,7 @@ win32_ioctl(int i, unsigned int u, char *data)
 {
     u_long argp = (u_long)data;
     int retval;
+    dPERLOBJ;
 
     if (!wsock_started) {
 	Perl_croak_nocontext("ioctl implemented only on sockets");
@@ -561,24 +562,28 @@ win32_inet_addr(const char FAR *cp)
 void
 win32_endhostent() 
 {
+    dPERLOBJ;
     Perl_croak_nocontext("endhostent not implemented!\n");
 }
 
 void
 win32_endnetent()
 {
+    dPERLOBJ;
     Perl_croak_nocontext("endnetent not implemented!\n");
 }
 
 void
 win32_endprotoent()
 {
+    dPERLOBJ;
     Perl_croak_nocontext("endprotoent not implemented!\n");
 }
 
 void
 win32_endservent()
 {
+    dPERLOBJ;
     Perl_croak_nocontext("endservent not implemented!\n");
 }
 
@@ -586,6 +591,7 @@ win32_endservent()
 struct netent *
 win32_getnetent(void) 
 {
+    dPERLOBJ;
     Perl_croak_nocontext("getnetent not implemented!\n");
     return (struct netent *) NULL;
 }
@@ -593,6 +599,7 @@ win32_getnetent(void)
 struct netent *
 win32_getnetbyname(char *name) 
 {
+    dPERLOBJ;
     Perl_croak_nocontext("getnetbyname not implemented!\n");
     return (struct netent *)NULL;
 }
@@ -600,6 +607,7 @@ win32_getnetbyname(char *name)
 struct netent *
 win32_getnetbyaddr(long net, int type) 
 {
+    dPERLOBJ;
     Perl_croak_nocontext("getnetbyaddr not implemented!\n");
     return (struct netent *)NULL;
 }
@@ -607,6 +615,7 @@ win32_getnetbyaddr(long net, int type)
 struct protoent *
 win32_getprotoent(void) 
 {
+    dPERLOBJ;
     Perl_croak_nocontext("getprotoent not implemented!\n");
     return (struct protoent *) NULL;
 }
@@ -614,6 +623,7 @@ win32_getprotoent(void)
 struct servent *
 win32_getservent(void) 
 {
+    dPERLOBJ;
     Perl_croak_nocontext("getservent not implemented!\n");
     return (struct servent *) NULL;
 }
@@ -621,6 +631,7 @@ win32_getservent(void)
 void
 win32_sethostent(int stayopen)
 {
+    dPERLOBJ;
     Perl_croak_nocontext("sethostent not implemented!\n");
 }
 
@@ -628,6 +639,7 @@ win32_sethostent(int stayopen)
 void
 win32_setnetent(int stayopen)
 {
+    dPERLOBJ;
     Perl_croak_nocontext("setnetent not implemented!\n");
 }
 
@@ -635,6 +647,7 @@ win32_setnetent(int stayopen)
 void
 win32_setprotoent(int stayopen)
 {
+    dPERLOBJ;
     Perl_croak_nocontext("setprotoent not implemented!\n");
 }
 
@@ -642,6 +655,7 @@ win32_setprotoent(int stayopen)
 void
 win32_setservent(int stayopen)
 {
+    dPERLOBJ;
     Perl_croak_nocontext("setservent not implemented!\n");
 }