diff -urN DBD-ODBC-0.28.orig/MANIFEST DBD-ODBC-0.28/MANIFEST
--- DBD-ODBC-0.28.orig/MANIFEST	Thu Mar  9 03:45:03 2000
+++ DBD-ODBC-0.28/MANIFEST	Thu Aug 10 14:03:09 2000
@@ -3,7 +3,6 @@
 Makefile.PL
 README
 README.adabas
-README.cygwin
 ODBC.h
 ODBC.pm
 ODBC.xs
diff -urN DBD-ODBC-0.28.orig/Makefile.PL DBD-ODBC-0.28/Makefile.PL
--- DBD-ODBC-0.28.orig/Makefile.PL	Thu Mar  9 03:45:03 2000
+++ DBD-ODBC-0.28/Makefile.PL	Thu Aug 10 14:05:51 2000
@@ -74,7 +74,7 @@
     my $odbchome= $::opt_o || $ENV{ODBCHOME};
 
     # per patches from Teun Burgers
-    if (!$odbchome && $ENV{WINDIR} && $^O =~ /^cygwin/) {
+    if (!$odbchome && $ENV{WINDIR} && $^O eq 'cygwin') {
 	my $tmp_odbchome = $ENV{WINDIR};
 	$tmp_odbchome =~ s/^([A-Za-z]):*$/\/\/$1/;
 	$tmp_odbchome =~ s/\\/\//g;
@@ -108,7 +108,7 @@
 
     my $myodbc ='';	# edit and hack to suit!
 
-    $myodbc = 'MicroSoft ODBC'
+    $myodbc = 'Microsoft ODBC'
                  if (    -e "$odbchome/system/odbc32.dll" or
 			 -e "$odbchome/system32/odbc32.dll" or
                          -e "$odbchome/odbc32.dll");
@@ -142,14 +142,16 @@
 
     warn "\nUmm, this looks like a $myodbc type of driver manager.\n";
 
-    if ($myodbc =~ /^MicroSoft ODBC/) {
-	print "\nBuilding for MicroSoft under CygWin32\n";
-	$opts{LIBS} = "-lodbc32 -lodbccp32";
+    if ($myodbc eq 'Microsoft ODBC') {
+	print "\nBuilding for Microsoft under Cygwin\n";
+	$opts{LIBS} = "-lodbc32";
+        print SQLH "#include <windows.h>\n";
         print SQLH "#include <sql.h>\n";
         print SQLH "#include <sqlext.h>\n";
-        $opts{dynamic_lib} = {OTHERLDFLAGS => "-lodbc32 -lodbccp32"};
+        print SQLH "#undef WIN32\n";
+        $opts{dynamic_lib} = {OTHERLDFLAGS => "-lodbc32"};
     }
-    if ($myodbc eq 'iodbc') {
+    elsif ($myodbc eq 'iodbc') {
 	my $ilibdir = "$odbchome/lib"; 
 	my @ilibs = <$ilibdir/*iodbc*.*>;
 	@ilibs = grep { /\.($Config{so}|$Config{dlext}|a)$/ } @ilibs;
@@ -214,7 +216,7 @@
 	@ilibs = grep { /\.($Config{so}|$Config{dlext}|a)$/ } @ilibs;
 	die "That's odd, I can't see any esoobclient libs in $odbchome" unless @ilibs;
 	print "We expect to find the sql.h and sqlext.h files (which were\n";
-	print "supplied with esoobclient) in \$ODBCHOME\include directory alongside\n";
+	print "supplied with esoobclient) in \$ODBCHOME/include directory alongside\n";
 	print "the @ilibs library.\n\n";
 	my $ilibpath = $ilibs[0]; # XXX if both .so and .a, pick based on LINKTYPE?
 	my $ilibname = basename($ilibpath);
diff -urN DBD-ODBC-0.28.orig/README.cygwin DBD-ODBC-0.28/README.cygwin
--- DBD-ODBC-0.28.orig/README.cygwin	Thu Mar  9 03:45:04 2000
+++ DBD-ODBC-0.28/README.cygwin	Thu Jan  1 00:00:00 1970
@@ -1,61 +0,0 @@
-=head1 Introduction
-
-This document describes how to build DBD::ODBC
-for perl ported to the cygwin platform.
-
-=head1 Prerequisites
-
-To build DBD::ODBC you need the following in
-order of installation:
-
-=over 4
-
-=item The cygwin tools
-
-The cygwin tools provide a unix environment on top
-of windows 95 en windows NT. It include a port of
-gcc and the main unix program development tools.
-The most recent cygwin version (currently B20.1)
-is available at http://sourceware.cygnus.com/cygwin/
-
-=item perl 5.00503
-
-Perl 5.00503 does not compile out of the box for cygwin. There is
-a good binary distribution however of perl 5.00503 for cygwin B20.1
-at http://cygutils.netpedia.net/. This port has the ability to build
-dynamic extensions.
-
-=item Windows ODBC headers and import libraries
-
-A rather complete set of headers and import libraries for windows
-including those for ODBC by Anders Norlander can be found at
-http://www.acc.umu.se/~anorland/gnu-win32/ I used version 0.1.5.
-
-=item DBI-1.12 or later from CPAN.
-
-DBI will build out of the box. Compilation does yield harmless messages
-of incompatible compiler versions. Testing will yield taint errors in
-Cwd.pm called from F<t/examp.t>. F<t/examp.t> must be run with -T unset.
-
-=item This module (DBD::ODBC)
-
-Install as in README. Again compilation will yield harmless messages of
-incompatible compiler versions.  After configuring a suitable datasource
-in 32-bit ODBC from your configuration screen, make test should pass
-all tests succesfully. I use it for MS Access 97 databases and
-sofar this works fine.
-
-=back
-
-=head1 TODO
-
-Make both DBI and DBD::ODBC compile cleanly and
-make DBI pass all test cleanly on this platform.
-
-=head1 COLOFON
-
- Author: Teun Burgers
- E-mail: burgers@ecn.nl
- Date:   15-07-1999
-
-=cut