diff options
| author | Greg Matheson <lang@ms.chinmin.edu.tw> | 2003-10-30 22:11:58 +0800 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@gmail.com> | 2003-11-07 20:42:07 +0000 |
| commit | de83437f3b4cf4b0079d4d014d49aa786337f178 (patch) | |
| tree | 975237bafa8fd2e7fa2e47a4a76ba883ae0964bb | |
| parent | da5d3de6a71c6bb4d7468809e5d66a625fb1d255 (diff) | |
| download | perl-de83437f3b4cf4b0079d4d014d49aa786337f178.tar.gz | |
Integrate change #21617 from bleadperl :
Portability nit for MinGW 3.
Subject: MinGW-3.1.0-1 _CRTIMP definition preempting win32.h's
Message-ID: <20031030141158.A11772@ms>
(actual patch by Abe Timmerman)
p4raw-link: @21617 on //depot/perl: 15689010d82050a2c02fc94ccd5d5d748e306cd0
p4raw-id: //depot/maint-5.6/perl-5.6.2@21678
| -rw-r--r-- | win32/win32.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/win32/win32.h b/win32/win32.h index f5cc83e5e5..f423c8dfd3 100644 --- a/win32/win32.h +++ b/win32/win32.h @@ -494,6 +494,9 @@ struct interp_intern { #ifdef PERL_CORE /* C doesn't like repeat struct definitions */ +#if defined(__MINGW32__) && (__MINGW32_MAJOR_VERSION>=3) +#undef _CRTIMP +#endif #ifndef _CRTIMP #define _CRTIMP __declspec(dllimport) #endif |