diff options
author | Gurusamy Sarathy <gsar@cpan.org> | 1998-09-23 01:39:23 +0000 |
---|---|---|
committer | Gurusamy Sarathy <gsar@cpan.org> | 1998-09-23 01:39:23 +0000 |
commit | 2b336d574a67def1a543951ad2cebeef42c08aea (patch) | |
tree | 8e478421f56ffd8aa6794a7c4295e674daf902d4 /win32 | |
parent | 95883bf30d6fc6c143368c6f07aea00e33c76a2b (diff) | |
parent | 3da4a4041c2dd401ef4ab882068e7b1680dc25bd (diff) | |
download | perl-2b336d574a67def1a543951ad2cebeef42c08aea.tar.gz |
integrate maint-5.005 changes (except conflicting change#1794)
p4raw-link: @1794 on //depot/maint-5.005/perl: 3da4a4041c2dd401ef4ab882068e7b1680dc25bd
p4raw-id: //depot/perl@1798
Diffstat (limited to 'win32')
-rw-r--r-- | win32/win32.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/win32/win32.h b/win32/win32.h index 5b3f91d911..0a3f19bb1c 100644 --- a/win32/win32.h +++ b/win32/win32.h @@ -27,7 +27,9 @@ typedef long long __int64; /* GCC does not do __declspec() - render it a nop * and turn on options to avoid importing data */ +#ifndef __declspec # define __declspec(x) +#endif # ifndef PERL_OBJECT # define PERL_GLOBAL_STRUCT # define MULTIPLICITY @@ -213,7 +215,9 @@ struct mgvtbl { \ typedef long uid_t; typedef long gid_t; +#ifndef _environ #define _environ environ +#endif #define flushall _flushall #define fcloseall _fcloseall |