--- perlwin32/win32/makefile.mk.orig	2004-11-27 09:26:09.000000000 -0800
+++ perlwin32/win32/makefile.mk	2005-01-03 11:48:40.477425600 -0800
@@ -394,8 +394,8 @@ LINK_FLAGS	+= -L"$(CCLIBDIR)\Release"
 
 .ELIF "$(CCTYPE)" == "GCC"
 
-CC		= gcc
-LINK32		= g++
+CC		= gcc -mno-cygwin
+LINK32		= g++ -mno-cygwin
 LIB32		= ar rc
 IMPLIB		= dlltool
 RSC		= windres

##</code><code>##

--- perlwin32/lib/ExtUtils/MM_Unix.pm.orig	2004-12-15 05:11:11.000000000 -0800
+++ perlwin32/lib/ExtUtils/MM_Unix.pm	2005-01-03 12:23:05.206360000 -0800
@@ -366,8 +366,8 @@ sub const_cccmd {
     return $self->{CONST_CCCMD} =
 	q{CCCMD = $(CC) -c $(PASTHRU_INC) $(INC) \\
 	$(CCFLAGS) $(OPTIMIZE) \\
-	$(PERLTYPE) $(MPOLLUTE) $(DEFINE_VERSION) \\
-	$(XS_DEFINE_VERSION)};
+	$(PERLTYPE) $(MPOLLUTE) "$(DEFINE_VERSION)" \\
+	"$(XS_DEFINE_VERSION)"};
 }
 
 =item const_config (o)

##</code><code>##

--- perlwin32/win32/config.gc.orig	2005-01-03 12:44:00.261040000 -0800
+++ perlwin32/win32/config.gc	2005-01-03 12:58:26.436539200 -0800
@@ -41,12 +41,12 @@ byteorder='1234'
 c=''
 castflags='0'
 cat='type'
-cc='~CC~'
+cc='~cc~'
 cccdlflags=' '
 ccdlflags=' '
 ccflags='-MD -DWIN32'
 ccflags_uselargefiles=''
-ccname='~CC~'
+ccname='~cc~'
 ccsymbols=''
 ccversion=''
 cf_by='nobody'
@@ -62,14 +62,14 @@ compress=''
 contains='grep'
 cp='copy'
 cpio=''
-cpp='gcc -E'
+cpp='~cc~ -E'
 cpp_stuff='42'
 cppccsymbols=''
 cppflags='-DWIN32'
 cpplast=''
 cppminus='-'
-cpprun='gcc -E'
-cppstdin='gcc -E'
+cpprun='~cc~ -E'
+cppstdin='~cc~ -E'
 cppsymbols=''
 crypt_r_proto='0'
 cryptlib=''
@@ -672,7 +672,7 @@ ivsize='4'
 ivtype='long'
 known_extensions='~static_ext~ ~dynamic_ext~ ~nonxs_ext~'
 ksh=''
-ld='gcc'
+ld='~cc~'
 lddlflags='-mdll ~LINK_FLAGS~'
 ldflags='~LINK_FLAGS~'
 ldflags_uselargefiles=''

--- perlwin32/ext/Errno/Errno_pm.PL.orig	2004-12-01 06:11:10.000000000 -0800
+++ perlwin32/ext/Errno/Errno_pm.PL	2005-01-03 14:38:44.269758400 -0800
@@ -20,6 +20,12 @@ unlink "errno.c" if -f "errno.c";
 sub process_file {
     my($file) = @_;
 
+    # for win32 perl under cygwin, we need to get a windows pathname
+    if ($^O eq 'MSWin32' && $Config{cc} =~ /\B-mno-cygwin\b/ &&
+        defined($file) && !-f $file) {
+        chomp($file = `cygpath -w "$file"`);
+    }
+
     return unless defined $file and -f $file;
 #   warn "Processing $file\n";
 

##</code><code>##

Failed Test                Stat Wstat Total Fail  Failed  List of Failed
-------------------------------------------------------------------------------
../lib/Config/Extensions.t    9  2304    88    9  10.23%  11 17 19 23 41 67 71
                                                          73 77