First pass of integrating the Rhapsody port,

[p5sagit/p5-mst-13.2.git] / perl.c

diff --git a/perl.c b/perl.c
index bda1498..8e11c43 100644 (file)
--- 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':