X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl.c;h=8e11c43cbfd7c61feaa52888574ecf4b4527bb0f;hb=8f1f23e8b15dc90b39e5be39711437f27f72b526;hp=bda1498b3e907df80c23b01eb7b450676ec2269d;hpb=11d617a5325160ea52fabaf3a105ac49b9e104fd;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/perl.c b/perl.c
index bda1498..8e11c43 100644
--- a/perl.c
+++ b/perl.c
@@ -658,7 +658,7 @@ setuid perl scripts securely.\n");
 	return 255;
 #endif
 
-#if defined(NeXT) && defined(__DYNAMIC__)
+#if defined(__DYNAMIC__) && (defined(NeXT) || defined(__NeXT__))
     _dyld_lookup_and_bind
 	("__environ", (unsigned long *) &environ_pointer, NULL);
 #endif /* environ */
@@ -732,6 +732,9 @@ setuid perl scripts securely.\n");
 	s = argv[0]+1;
       reswitch:
 	switch (*s) {
+#ifndef PERL_STRICT_CR
+	case '\r':
+#endif
 	case ' ':
 	case '0':
 	case 'F':