X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=perl.h;h=3dcb14624a8deb13ade4be93537d06c237e971fc;hb=1018e26f1c13277648057b08a7b77db44ebc46fe;hp=4dfc8ef09fbef64cc2dea0071a5ec0ef6838cd3f;hpb=02fc2eeebe0e138f51e361717ee5d2258b2c13d0;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/perl.h b/perl.h
index 4dfc8ef..3dcb146 100644
--- a/perl.h
+++ b/perl.h
@@ -254,7 +254,7 @@ register struct op *Perl_op asm(stringify(OP_IN_REGISTER));
 
 #if defined(HASVOLATILE) || defined(STANDARD_C)
 #   ifdef __cplusplus
-#	define VOL		// to temporarily suppress warnings
+#	define VOL		/* to temporarily suppress warnings */
 #   else
 #	define VOL volatile
 #   endif
@@ -425,7 +425,7 @@ int usleep(unsigned int);
 #  define MYSWAP
 #endif
 
-/* Cannot include embed.h here on Win32 as win32.h has not 
+/* Cannot include embed.h here on Win32 as win32.h has not
    yet been included and defines some config variables e.g. HAVE_INTERP_INTERN
  */
 #if !defined(PERL_FOR_X2P) && !(defined(WIN32)||defined(VMS))
@@ -1789,7 +1789,11 @@ typedef struct clone_params CLONE_PARAMS;
 #endif
 
 #if defined(__VOS__)
-#   include "vosish.h"
+#   ifdef __GNUC__
+#     include "./vos/vosish.h"
+#   else
+#     include "vos/vosish.h"
+#   endif
 #   define ISHISH "vos"
 #endif
 
@@ -3943,12 +3947,17 @@ int flock(int fd, int op);
 #if O_TEXT != O_BINARY
     /* If you have different O_TEXT and O_BINARY and you are a CLRF shop,
      * that is, you are somehow DOSish. */
-#   if !defined(__BEOS__)
-#      define PERLIO_USING_CRLF 1
-#   else
+#   if defined(__BEOS__) || defined(__VOS__)
+    /* BeOS has O_TEXT != O_BINARY but O_TEXT and O_BINARY have no effect;
+     * BeOS is always UNIXoid (LF), not DOSish (CRLF). */
+    /* VOS has O_TEXT != O_BINARY, and they have effect,
+     * but VOS always uses LF, never CRLF. */
     /* If you have O_TEXT different from your O_BINARY but you still are
      * not a CRLF shop. */
 #       undef PERLIO_USING_CRLF
+#   else
+    /* If you really are DOSish. */
+#      define PERLIO_USING_CRLF 1
 #   endif
 #endif
 
@@ -4096,7 +4105,7 @@ extern void moncontrol(int);
    HAS_STRUCT_CMSGHDR
 
    HAS_NL_LANGINFO
-   
+
    HAS_DIRFD
 
    so that Configure picks them up. */