From c21fb2b8c48331d89b906fb965cfe30006323e4e Mon Sep 17 00:00:00 2001 From: Jarkko Hietaniemi Date: Mon, 10 Dec 2001 18:25:30 +0000 Subject: Silence BeOS compilation moaning. p4raw-id: //depot/perl@13601 --- perl.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'perl.h') diff --git a/perl.h b/perl.h index c9d359c8f5..c3720a4741 100644 --- a/perl.h +++ b/perl.h @@ -931,11 +931,15 @@ int sockatmark(int); # define S_IRWXO (S_IROTH|S_IWOTH|S_IXOTH) #endif -#ifndef S_IREAD +/* BeOS 5.0 seems to define S_IREAD and S_IWRITE in + * which would get included through , but that is 3000 + * lines in the future. --jhi */ + +#if !defined(S_IREAD) && !defined(__BEOS__) # define S_IREAD S_IRUSR #endif -#ifndef S_IWRITE +#if !defined(S_IWRITE) && !defined(__BEOS__) # define S_IWRITE S_IWUSR #endif -- cgit v1.2.1 From 6ce75a778d390cfc1b903c40f2566d0e560efcd8 Mon Sep 17 00:00:00 2001 From: Jarkko Hietaniemi Date: Tue, 11 Dec 2001 14:33:14 +0000 Subject: Try to handle platforms that have O_TEXT != O_BINARY but which are not DOSish, BeOS being one of such platforms. Ideally this should be a Configure test, not a hardwired cpp symbol test... p4raw-id: //depot/perl@13621 --- perl.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'perl.h') diff --git a/perl.h b/perl.h index c3720a4741..8f759d06c1 100644 --- a/perl.h +++ b/perl.h @@ -3925,6 +3925,18 @@ int flock(int fd, int op); # define O_TEXT 0 #endif +#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_CLRF 1 +# else + /* If you have O_TEXT different from your O_BINARY but you still are + * not a CRLF shop. */ +# undef PERLIO_CLRF +# endif +#endif + #ifdef IAMSUID #ifdef I_SYS_STATVFS -- cgit v1.2.1 From 19848b3fa09ce050a4be1811af91c3670de2759e Mon Sep 17 00:00:00 2001 From: Jarkko Hietaniemi Date: Tue, 11 Dec 2001 15:12:18 +0000 Subject: Unlean the leaning tower of Babel. p4raw-id: //depot/perl@13623 --- perl.h | 77 ++++++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 44 insertions(+), 33 deletions(-) (limited to 'perl.h') diff --git a/perl.h b/perl.h index 8f759d06c1..ace2aac382 100644 --- a/perl.h +++ b/perl.h @@ -1753,45 +1753,56 @@ typedef struct clone_params CLONE_PARAMS; #endif #if defined(__OPEN_VM) -# include "vmesa/vmesaish.h" +# include "vmesa/vmesaish.h" +# define ISHISH "vmesa" #endif #ifdef DOSISH -# if defined(OS2) -# include "os2ish.h" -# else -# include "dosish.h" -# endif -#else -# if defined(VMS) +# if defined(OS2) +# include "os2ish.h" +# else +# include "dosish.h" +# endif +# define ISHISH "dos" +#endif + +#if defined(VMS) # include "vmsish.h" # include "embed.h" -# else -# if defined(PLAN9) -# include "./plan9/plan9ish.h" -# else -# if defined(MPE) -# include "mpeix/mpeixish.h" -# else -# if defined(__VOS__) -# include "vosish.h" -# else -# if defined(EPOC) -# include "epocish.h" -# else -# if defined(MACOS_TRADITIONAL) -# include "macos/macish.h" -# ifndef NO_ENVIRON_ARRAY -# define NO_ENVIRON_ARRAY -# endif -# else -# include "unixish.h" -# endif -# endif -# endif -# endif +# define ISHISH "vms" +#endif + +#if defined(PLAN9) +# include "./plan9/plan9ish.h" +# define ISHISH "plan9" +#endif + +#if defined(MPE) +# include "mpeix/mpeixish.h" +# define ISHISH "mpeix" +#endif + +#if defined(__VOS__) +# include "vosish.h" +# define ISHISH "vos" +#endif + +#if defined(EPOC) +# include "epocish.h" +# define ISHISH "epoc" +#endif + +#if defined(MACOS_TRADITIONAL) +# include "macos/macish.h" +# ifndef NO_ENVIRON_ARRAY +# define NO_ENVIRON_ARRAY # endif -# endif +# define ISHISH "macos classic" +#endif + +#ifndef ISHISH +# include "unixish.h" +# define ISHISH "unix" #endif #ifndef NO_ENVIRON_ARRAY -- cgit v1.2.1 From efca5cc673562689e514ffff7cdd6f79da683149 Mon Sep 17 00:00:00 2001 From: Jarkko Hietaniemi Date: Tue, 11 Dec 2001 15:27:06 +0000 Subject: The BeOS waitpid() seems to be broken, have a wrapper for it. p4raw-id: //depot/perl@13624 --- perl.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'perl.h') diff --git a/perl.h b/perl.h index ace2aac382..dbfadc8bb3 100644 --- a/perl.h +++ b/perl.h @@ -1800,6 +1800,11 @@ typedef struct clone_params CLONE_PARAMS; # define ISHISH "macos classic" #endif +#if defined(__BEOS__) +# include "beos/beosish.h" +# define ISHISH "beos" +#endif + #ifndef ISHISH # include "unixish.h" # define ISHISH "unix" -- cgit v1.2.1 From 35990314f73df48945aa05a488674262637a7abb Mon Sep 17 00:00:00 2001 From: Jarkko Hietaniemi Date: Wed, 12 Dec 2001 00:37:20 +0000 Subject: Detypo and rename. p4raw-id: //depot/perl@13637 --- perl.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'perl.h') diff --git a/perl.h b/perl.h index dbfadc8bb3..5782b71b6b 100644 --- a/perl.h +++ b/perl.h @@ -3945,11 +3945,11 @@ int flock(int fd, int op); /* 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_CLRF 1 +# define PERLIO_USING_CRLF 1 # else /* If you have O_TEXT different from your O_BINARY but you still are * not a CRLF shop. */ -# undef PERLIO_CLRF +# undef PERLIO_USING_CRLF # endif #endif -- cgit v1.2.1 From 619685113277299f7d5ceee4658212496ca713ad Mon Sep 17 00:00:00 2001 From: Gisle Aas Date: Tue, 11 Dec 2001 12:52:57 -0800 Subject: Passing in env to perl_parse did not work Message-ID: p4raw-id: //depot/perl@13660 --- perl.h | 7 ------- 1 file changed, 7 deletions(-) (limited to 'perl.h') diff --git a/perl.h b/perl.h index 5782b71b6b..d25ffd7f22 100644 --- a/perl.h +++ b/perl.h @@ -1814,13 +1814,6 @@ typedef struct clone_params CLONE_PARAMS; # define USE_ENVIRON_ARRAY #endif -#ifdef JPL - /* E.g. JPL needs to operate on a copy of the real environment. - * JDK 1.2 and 1.3 seem to get upset if the original environment - * is diddled with. */ -# define NEED_ENVIRON_DUP_FOR_MODIFY -#endif - /* * initialise to avoid floating-point exceptions from overflow, etc */ -- cgit v1.2.1