From: Jarkko Hietaniemi <jhi@iki.fi>
Date: Wed, 26 Jul 2000 16:05:30 +0000 (+0000)
Subject: MacOS nits from Matthias Neeracher.
X-Git-Tag: accepted/trunk/20130322.191538~34737
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=eae9c1515e21a0ce7cdb8dfed3c4386402d77e42;p=platform%2Fupstream%2Fperl.git

MacOS nits from Matthias Neeracher.

p4raw-id: //depot/perl@6442
---

diff --git a/perl.c b/perl.c
index 3c32a4e..969d783 100644
--- a/perl.c
+++ b/perl.c
@@ -2241,6 +2241,10 @@ Perl_moreswitches(pTHX_ char *s)
 
 	PerlIO_printf(PerlIO_stdout(),
 		      "\n\nCopyright 1987-2000, Larry Wall\n");
+#ifdef MACOS_TRADITIONAL
+	PerlIO_printf(PerlIO_stdout(),
+		      "\nMacOS port Copyright (c) 1991-2000, Matthias Neeracher\n");
+#endif
 #ifdef MSDOS
 	PerlIO_printf(PerlIO_stdout(),
 		      "\nMS-DOS port Copyright (c) 1989, 1990, Diomidis Spinellis\n");
diff --git a/pp_ctl.c b/pp_ctl.c
index 776754e..ce9e198 100644
--- a/pp_ctl.c
+++ b/pp_ctl.c
@@ -3158,8 +3158,8 @@ trylocal: {
 		else {
 		    char *dir = SvPVx(dirsv, n_a);
 #ifdef MACOS_TRADITIONAL
-		    /* We have ensured in incpush that library ends with ':' */
-		    Perl_sv_setpvf(aTHX_ namesv, "%s%s", dir, name+(name[0] == ':'));
+		    char buf[256];
+		    Perl_sv_setpvf(aTHX_ namesv, "%s%s", MacPerl_CanonDir(dir, buf), name+(name[0] == ':'));
 #else
 #ifdef VMS
 		    char *unixdir;