*** ./lib/Cwd.pm.ORIG	Tue Mar  7 05:19:33 1995
--- ./lib/Cwd.pm	Wed May 17 18:04:52 1995
***************
*** 24,29 ****
--- 24,31 ----
  sub getcwd
  {
      if($Config{'osname'} eq 'VMS') { return $ENV{'PWD'} = $ENV{'DEFAULT'} }
+     my($dslash) = '';
+     if($Config{'osname'} eq 'apollo') { $dslash = '/'; }
  
      my($dotdots, $cwd, @pst, @cst, $dir, @tst);
  
***************
*** 78,84 ****
  	closedir(PARENT);
      } while ($dir);
      chop($cwd); # drop the trailing /
!     $cwd;
  }
  
  
--- 80,86 ----
  	closedir(PARENT);
      } while ($dir);
      chop($cwd); # drop the trailing /
!     $dslash . $cwd;
  }
  
  
***************
*** 92,97 ****
--- 94,101 ----
  
  sub fastcwd {
      if($Config{'osname'} eq 'VMS') { return $ENV{'DEFAULT'} }
+     my($dslash) = '';
+     if($Config{'osname'} eq 'apollo') { $dslash = '/'; }
  
      my($odev, $oino, $cdev, $cino, $tdev, $tino);
      my(@path, $path);
***************
*** 117,123 ****
  	closedir(DIR);
  	unshift(@path, $direntry);
      }
!     chdir($path = '/' . join('/', @path));
      $path;
  }
  
--- 121,127 ----
  	closedir(DIR);
  	unshift(@path, $direntry);
      }
!     chdir($path = $dslash . '/' . join('/', @path));
      $path;
  }
  
***************
*** 145,151 ****
      else {
  	chop($ENV{'PWD'} = `pwd`);
      }
!     if ($ENV{'PWD'} =~ m|(/[^/]+(/[^/]+/[^/]+))(.*)|) {
  	my($pd,$pi) = stat($2);
  	my($dd,$di) = stat($1);
  	if (defined $pd and defined $dd and $di == $pi and $dd == $pd) {
--- 149,155 ----
      else {
  	chop($ENV{'PWD'} = `pwd`);
      }
!     if ($ENV{'PWD'} =~ m|(//?[^/]+(/[^/]+/[^/]+))(.*)|) {
  	my($pd,$pi) = stat($2);
  	my($dd,$di) = stat($1);
  	if (defined $pd and defined $dd and $di == $pi and $dd == $pd) {
***************
*** 157,163 ****
  
  sub chdir {
      my($newdir) = shift;
!     $newdir =~ s|/{2,}|/|g;
      chdir_init() unless $chdir_init;
      return 0 unless (CORE::chdir $newdir);
      if ($Config{'osname'} eq 'VMS') { return $ENV{PWD} = $ENV{DEFAULT} }
--- 161,172 ----
  
  sub chdir {
      my($newdir) = shift;
!     if ($Config{'osname'} eq 'apollo') {
!         $newdir =~ s|^(/)/{2,}\|/{2,}|$1/|g; # leave double slash on begin
!     }
!     else {
!         $newdir =~ s|/{2,}|/|g;
!     }
      chdir_init() unless $chdir_init;
      return 0 unless (CORE::chdir $newdir);
      if ($Config{'osname'} eq 'VMS') { return $ENV{PWD} = $ENV{DEFAULT} }
*** ./lib/fastcwd.pl.ORIG	Tue Oct 18 18:36:05 1994
--- ./lib/fastcwd.pl	Fri May 19 16:52:10 1995
***************
*** 30,35 ****
  		unshift(@path, $_);
  	}
  	chdir($path = '/' . join('/', @path));
! 	$path;
  }
  1;
--- 30,40 ----
  		unshift(@path, $_);
  	}
  	chdir($path = '/' . join('/', @path));
! 	if ($ENV{'SYSTYPE'} =~ m/sys5.3|bsd4.3/ && $ENV{'ISP'} ne "") {
! 		'/' . $path;	# seems to be an Apollo -> double slash
! 	}
! 	else {
! 		$path;
! 	}
  }
  1;
*** ./lib/getcwd.pl.ORIG	Tue Oct 18 18:36:19 1994
--- ./lib/getcwd.pl	Fri May 19 15:39:57 1995
***************
*** 56,62 ****
  	closedir(getcwd'PARENT);					#');
      } while ($dir);
      chop($cwd);
!     $cwd;
  }
  
  1;
--- 56,67 ----
  	closedir(getcwd'PARENT);					#');
      } while ($dir);
      chop($cwd);
!     if ($ENV{'SYSTYPE'} =~ m/sys5.3|bsd4.3/ && $ENV{'ISP'} ne "") {
! 	'/' . $cwd; # seems to be an Apollo -> double slash
!     }
!     else {
!         $cwd;
!     }
  }
  
  1;
*** ./pp_ctl.c.ORIG	Fri Apr 28 20:09:37 1995
--- ./pp_ctl.c	Fri May 19 17:42:25 1995
***************
*** 165,170 ****
--- 165,173 ----
      double value;
      bool gotsome;
      STRLEN len;
+ #ifdef apollo
+     U16 tmpval;
+ #endif
  
      if (!SvCOMPILED(form)) {
  	SvREADONLY_off(form);
***************
*** 208,214 ****
--- 211,222 ----
  	    else
  		fprintf(stderr, "%-16s\n", name);
  	} )
+ #ifdef apollo
+ 	tmpval = *fpc++;
+ 	switch (tmpval) {
+ #else
  	switch (*fpc++) {
+ #endif
  	case FF_LINEMARK:
  	    linemark = t;
  	    lines++;