diff options
author | Malcolm Beattie <mbeattie@sable.ox.ac.uk> | 1998-05-28 18:07:24 +0000 |
---|---|---|
committer | Malcolm Beattie <mbeattie@sable.ox.ac.uk> | 1998-05-28 18:07:24 +0000 |
commit | 1a621c465c9560e7209563b9aca8042abcf43dcc (patch) | |
tree | b464a0ff6267e741dc96ff5670f8580600f9264c /ext/POSIX | |
parent | bd89102fe7784367e3eeddc7cefae29defae903a (diff) | |
parent | a14cb26abd9e94e845d7de891545ccdb8fb0fad9 (diff) | |
download | perl-1a621c465c9560e7209563b9aca8042abcf43dcc.tar.gz |
Integrated win32 branch into mainline. The changes to t/op/ipc*.t
in change 1043 clashed badly with changes made in the win32
branch. I did an accept on the win32 branch version for now.
p4raw-id: //depot/perl@1048
Diffstat (limited to 'ext/POSIX')
-rw-r--r-- | ext/POSIX/POSIX.xs | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/ext/POSIX/POSIX.xs b/ext/POSIX/POSIX.xs index 1dba9a61f8..6b9611129f 100644 --- a/ext/POSIX/POSIX.xs +++ b/ext/POSIX/POSIX.xs @@ -108,6 +108,15 @@ # ifdef _MSC_VER # define mode_t short # endif +# ifdef __MINGW32__ +# define mode_t short +# ifndef tzset +# define tzset() not_here("tzset") +# endif +# ifndef _POSIX_OPEN_MAX +# define _POSIX_OPEN_MAX FOPEN_MAX /* XXX bogus ? */ +# endif +# endif # define sigaction(a,b,c) not_here("sigaction") # define sigpending(a) not_here("sigpending") # define sigprocmask(a,b,c) not_here("sigprocmask") @@ -255,13 +264,13 @@ unsigned long strtoul _((const char *, char **, int)); #define localeconv() not_here("localeconv") #endif -#ifndef WIN32 #ifdef HAS_TZNAME +# ifndef WIN32 extern char *tzname[]; +# endif #else char *tzname[] = { "" , "" }; #endif -#endif /* XXX struct tm on some systems (SunOS4/BSD) contains extra (non POSIX) * fields for which we don't have Configure support yet: |