This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
[asperl] bring ASPerl uptodate with mainline changes
authorGurusamy Sarathy <gsar@cpan.org>
Sat, 14 Feb 1998 01:00:15 +0000 (01:00 +0000)
committerGurusamy Sarathy <gsar@cpan.org>
Sat, 14 Feb 1998 01:00:15 +0000 (01:00 +0000)
p4raw-id: //depot/asperl@524

1  2 
pp_ctl.c
pp_hot.c
pp_sys.c
regcomp.c
regexec.c
scope.c
scope.h
sv.c
toke.c
win32/Makefile
win32/makefile.mk

diff --cc pp_ctl.c
Simple merge
diff --cc pp_hot.c
Simple merge
diff --cc 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
Simple merge