From 7432779b54fc5210793c84f9b87b6968ef4c5f51 Mon Sep 17 00:00:00 2001
From: Steve Hay <steve.m.hay@googlemail.com>
Date: Tue, 15 Apr 2014 20:54:01 +0100
Subject: Upgrade Win32 from version 0.48 to 0.49

This fixes the build with gcc-4.8.1 from http://www.mingw.org and thus
resolves perl #121643.
---
 Porting/Maintainers.pl | 2 +-
 cpan/Win32/Win32.pm    | 2 +-
 cpan/Win32/Win32.xs    | 1 +
 pod/perldelta.pod      | 8 ++++++++
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 43e0d01946..6498e2b02e 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -1302,7 +1302,7 @@ use File::Glob qw(:case);
     },
 
     'Win32' => {
-        'DISTRIBUTION' => "JDB/Win32-0.48.tar.gz",
+        'DISTRIBUTION' => "JDB/Win32-0.49.tar.gz",
         'FILES'        => q[cpan/Win32],
     },
 
diff --git a/cpan/Win32/Win32.pm b/cpan/Win32/Win32.pm
index 7d933039eb..027af0e0b5 100644
--- a/cpan/Win32/Win32.pm
+++ b/cpan/Win32/Win32.pm
@@ -8,7 +8,7 @@ package Win32;
     require DynaLoader;
 
     @ISA = qw|Exporter DynaLoader|;
-    $VERSION = '0.48';
+    $VERSION = '0.49';
     $XS_VERSION = $VERSION;
     $VERSION = eval $VERSION;
 
diff --git a/cpan/Win32/Win32.xs b/cpan/Win32/Win32.xs
index 1f573eb1b0..b47df40d14 100644
--- a/cpan/Win32/Win32.xs
+++ b/cpan/Win32/Win32.xs
@@ -1,3 +1,4 @@
+#define WIN32_LEAN_AND_MEAN
 #include <wctype.h>
 #include <windows.h>
 #include <shlobj.h>
diff --git a/pod/perldelta.pod b/pod/perldelta.pod
index 5ae7276e64..a9d9c4f8e2 100644
--- a/pod/perldelta.pod
+++ b/pod/perldelta.pod
@@ -181,6 +181,14 @@ L<Storable> has been upgraded from version 2.48 to 2.49.
 
 Recognition of tied SVs has been tightened up.
 
+=item *
+
+L<Win32> has been upgraded from version 0.48 to 0.49.
+
+This fixes a problem when building with B<gcc> version 4.8.1 from
+L<http://www.mingw.org>.
+[L<cpan #94730|https://rt.cpan.org/Public/Bug/Display.html?id=94730>]
+
 =back
 
 =head2 Removed Modules and Pragmata
-- 
cgit v1.2.1