[asperl] bring ASPerl uptodate with mainline changes

p4raw-id: //depot/asperl@524

diff --cc pp_ctl.c
Simple merge

diff --cc pp_hot.c
Simple merge

diff --cc pp_sys.c
index 8b0b557,ce5af57..55d00ed
--- 1/pp_sys.c
--- 2/pp_sys.c
+++ b/pp_sys.c
@@@ -3693,14 -3689,14 +3689,14 @@@ PP(pp_gnetent
      struct netent *nent;
  
      if (which == OP_GNBYNAME)
 -      nent = getnetbyname(POPp);
 +      nent = PerlSock_getnetbyname(POPp);
      else if (which == OP_GNBYADDR) {
        int addrtype = POPi;
-       Getnbadd_net_t addr = (Getnbadd_net_t) U_L(POPn);
+       Netdb_net_t addr = (Netdb_net_t) U_L(POPn);
 -      nent = getnetbyaddr(addr, addrtype);
 +      nent = PerlSock_getnetbyaddr(addr, addrtype);
      }
      else
 -      nent = getnetent();
 +      nent = PerlSock_getnetent();
  
      EXTEND(SP, 4);
      if (GIMME != G_ARRAY) {

diff --cc regcomp.c
Simple merge

diff --cc regexec.c
Simple merge

diff --cc scope.c
Simple merge

diff --cc scope.h
Simple merge

diff --cc sv.c
Simple merge

diff --cc toke.c
Simple merge

diff --cc win32/Makefile
Simple merge

diff --cc win32/makefile.mk
Simple merge