diff options
| author | Steve Hay <steve.m.hay@googlemail.com> | 2014-04-14 21:00:48 +0100 |
|---|---|---|
| committer | Steve Hay <steve.m.hay@googlemail.com> | 2014-04-14 23:15:26 +0100 |
| commit | a5d1065d95b2c2bac2459d722bc74ddd856f0f85 (patch) | |
| tree | b3b05bf706f554695fe59699f5cca8be0b8e229f | |
| parent | 200b4fd964d51e9e061e3425234c5271db3a89b1 (diff) | |
| download | perl-a5d1065d95b2c2bac2459d722bc74ddd856f0f85.tar.gz | |
Fix DllMain definition to fix building with gcc-4.8.1 from www.mingw.org
This partly fixes perl #121643.
| -rw-r--r-- | pod/perldelta.pod | 7 | ||||
| -rw-r--r-- | win32/perllib.c | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/pod/perldelta.pod b/pod/perldelta.pod index 05efcdaec8..67ebfc4bba 100644 --- a/pod/perldelta.pod +++ b/pod/perldelta.pod @@ -398,6 +398,13 @@ This has now been fixed. (Note that B<perl.exe> itself was unaffected, but obviously B<wperl.exe> would have been completely broken.) [L<perl #121471|https://rt.perl.org/Public/Bug/Display.html?id=121471>] +Perl can now be built with B<gcc> version 4.8.1 from L<http://www.mingw.org>. +This was previously broken due to an incorrect definition of C<DllMain()> in +one of perl's source files. Earlier B<gcc> versions were also affected when +using version 4 of the w32api package. Versions of B<gcc> available from +L<http://mingw-w64.sourceforge.net/> were not affected. +[L<perl #121643|https://rt.perl.org/Public/Bug/Display.html?id=121643>] + The test harness now has no failures when perl is built on a FAT drive with the Windows OS on an NTFS drive. [L<perl #21442|https://rt.perl.org/Public/Bug/Display.html?id=21442>] diff --git a/win32/perllib.c b/win32/perllib.c index 84a618a77f..cd1c11ad3a 100644 --- a/win32/perllib.c +++ b/win32/perllib.c @@ -291,7 +291,7 @@ EndSockets(void); EXTERN_C /* GCC in C++ mode mangles the name, otherwise */ #endif BOOL APIENTRY -DllMain(HANDLE hModule, /* DLL module handle */ +DllMain(HINSTANCE hModule, /* DLL module handle */ DWORD fdwReason, /* reason called */ LPVOID lpvReserved) /* reserved */ { |