diff options
| author | Gurusamy Sarathy <gsar@cpan.org> | 1999-12-28 18:40:19 +0000 |
|---|---|---|
| committer | Gurusamy Sarathy <gsar@cpan.org> | 1999-12-28 18:40:19 +0000 |
| commit | 5db1039675bdeda8d9e4e8a1462abefb8ede0419 (patch) | |
| tree | 7c515c7e6015a6511561b5fe09ec25d580a66ac4 /win32/win32.h | |
| parent | 33079e286d5308155d46cf4f82350ddbb5b5ad95 (diff) | |
| download | perl-5db1039675bdeda8d9e4e8a1462abefb8ede0419.tar.gz | |
Win9x + GCC update from Benjamin Stuhl <sho_pi@hotmail.com>
p4raw-id: //depot/perl@4729
Diffstat (limited to 'win32/win32.h')
| -rw-r--r-- | win32/win32.h | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/win32/win32.h b/win32/win32.h index 50b4f1936c..c953f5b38e 100644 --- a/win32/win32.h +++ b/win32/win32.h @@ -9,7 +9,9 @@ #ifndef _INC_WIN32_PERL5 #define _INC_WIN32_PERL5 -#define _WIN32_WINNT 0x0400 /* needed for TryEnterCriticalSection() etc. */ +#ifndef _WIN32_WINNT +# define _WIN32_WINNT 0x0400 /* needed for TryEnterCriticalSection() etc. */ +#endif #if defined(PERL_OBJECT) || defined(PERL_IMPLICIT_SYS) || defined(PERL_CAPI) # define DYNAMIC_ENV_FETCH @@ -35,18 +37,6 @@ # define __int64 long long # endif # define Win32_Winsock -/* 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 -# ifndef MULTIPLICITY -# define MULTIPLICITY -# endif -# endif #endif /* Define DllExport akin to perl's EXT, @@ -55,6 +45,8 @@ * otherwise import it. */ +/* now even GCC supports __declspec() */ + #if defined(PERL_OBJECT) #define DllExport #else @@ -251,9 +243,6 @@ typedef long gid_t; #define flushall _flushall #define fcloseall _fcloseall -#undef __attribute__ -#define __attribute__(x) - #ifndef CP_UTF8 # define CP_UTF8 65001 #endif |