summaryrefslogtreecommitdiff
path: root/win32/win32.c
diff options
context:
space:
mode:
authorAlain Barbet <alian@cpan.org>2002-10-18 17:29:29 +0200
committerhv <hv@crypt.org>2002-10-22 15:52:40 +0000
commit7c5b6093a3ac5e0bd09cdb0d2f391fecc26ce08d (patch)
tree2f2090455a41ffff9d35f8672046b8e90bf9c420 /win32/win32.c
parent9b488eb89e353c3569ec0fe5076be8c2a5f47436 (diff)
downloadperl-7c5b6093a3ac5e0bd09cdb0d2f391fecc26ce08d.tar.gz
Re: Smoke 18027 FAIL(F) MSWin32 5.0 Win2000Pro (MSWin32-x86)
Message-ID: <3DB00CB9.70708@alianwebserver.com> p4raw-id: //depot/perl@18046
Diffstat (limited to 'win32/win32.c')
-rw-r--r--win32/win32.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/win32/win32.c b/win32/win32.c
index fdadcb2f6f..633dbbdbcc 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -15,7 +15,8 @@
#define Win32_Winsock
#endif
#include <windows.h>
-#ifndef __MINGW32__ /* GCC/Mingw32-2.95.2 forgot the WINAPI on CommandLineToArgvW() */
+/* GCC-2.95.2/Mingw32-1.1 forgot the WINAPI on CommandLineToArgvW() */
+#if defined(__MINGW32__) && (__MINGW32_MAJOR_VERSION==1)
# include <shellapi.h>
#else
LPWSTR* WINAPI CommandLineToArgvW(LPCWSTR lpCommandLine, int * pNumArgs);
@@ -60,8 +61,8 @@
int _CRT_glob = 0;
#endif
-#if defined(__MINGW32__)
-/* Mingw32 is missing some prototypes */
+#if defined(__MINGW32__) && (__MINGW32_MAJOR_VERSION==1)
+/* Mingw32-1.1 is missing some prototypes */
FILE * _wfopen(LPCWSTR wszFileName, LPCWSTR wszMode);
FILE * _wfdopen(int nFd, LPCWSTR wszMode);
FILE * _freopen(LPCWSTR wszFileName, LPCWSTR wszMode, FILE * pOldStream);