From 7356da4775280cbf75f773a736185d18da7f3fef Mon Sep 17 00:00:00 2001
From: Ron Koenderink <rkoenderink@yahoo.ca>
Date: Fri, 23 Feb 2007 22:35:50 +0000
Subject: [PATCH] (add.c, disa.c, log.c, new.c, wantupd.c, wu.c)
 [_WIN32,__GNUC__]: Remove the !defined(__GNUC__) for <io.h>. Not required for
 VC8.

---
 src/lib/commands/add.c   | 2 +-
 src/lib/commands/disa.c  | 2 +-
 src/lib/commands/new.c   | 2 +-
 src/lib/common/file.c    | 2 --
 src/lib/common/log.c     | 2 +-
 src/lib/common/wantupd.c | 2 +-
 src/lib/subs/wu.c        | 2 +-
 7 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/lib/commands/add.c b/src/lib/commands/add.c
index 8a08e918..efd99ecb 100644
--- a/src/lib/commands/add.c
+++ b/src/lib/commands/add.c
@@ -34,7 +34,7 @@
 #include <config.h>
 
 #include <fcntl.h>
-#if defined(_WIN32) && !defined(__GNUC__)
+#if defined(_WIN32)
 #include <io.h>
 #endif
 
diff --git a/src/lib/commands/disa.c b/src/lib/commands/disa.c
index 2ce4d259..2aa9184b 100644
--- a/src/lib/commands/disa.c
+++ b/src/lib/commands/disa.c
@@ -33,7 +33,7 @@
 
 #include <config.h>
 
-#if defined(_WIN32) && !defined(__GNUC__)
+#if defined(_WIN32)
 #include <io.h>
 #endif
 #include <fcntl.h>
diff --git a/src/lib/commands/new.c b/src/lib/commands/new.c
index b3d43e22..5a15376a 100644
--- a/src/lib/commands/new.c
+++ b/src/lib/commands/new.c
@@ -34,7 +34,7 @@
 #include <config.h>
 
 #include <fcntl.h>
-#if defined(_WIN32) && !defined(__GNUC__)
+#if defined(_WIN32)
 #include <io.h>
 #endif
 #if !defined(_WIN32)
diff --git a/src/lib/common/file.c b/src/lib/common/file.c
index 20b38e69..f43dda0b 100644
--- a/src/lib/common/file.c
+++ b/src/lib/common/file.c
@@ -37,9 +37,7 @@
 
 #include <errno.h>
 #if defined(_WIN32)
-#if !defined(__GNUC__)
 #include <io.h>
-#endif
 #include <share.h>
 #endif
 #include <fcntl.h>
diff --git a/src/lib/common/log.c b/src/lib/common/log.c
index 8ca2f2b3..3c1bb65c 100644
--- a/src/lib/common/log.c
+++ b/src/lib/common/log.c
@@ -33,7 +33,7 @@
 
 #include <config.h>
 
-#if defined(_WIN32) && !defined(__GNUC__)
+#if defined(_WIN32)
 #include <io.h>
 #endif
 #if !defined(_WIN32)
diff --git a/src/lib/common/wantupd.c b/src/lib/common/wantupd.c
index 723973b7..62628d0d 100644
--- a/src/lib/common/wantupd.c
+++ b/src/lib/common/wantupd.c
@@ -35,7 +35,7 @@
 
 #include <fcntl.h>
 #include <stdio.h>
-#if defined(_WIN32) && !defined(__GNUC__)
+#if defined(_WIN32)
 #include <io.h>
 #endif
 #include <time.h>
diff --git a/src/lib/subs/wu.c b/src/lib/subs/wu.c
index 970625ca..91a9432d 100644
--- a/src/lib/subs/wu.c
+++ b/src/lib/subs/wu.c
@@ -33,7 +33,7 @@
 
 #include <config.h>
 
-#if defined(_WIN32) && !defined(__GNUC__)
+#if defined(_WIN32)
 #include <io.h>
 #endif
 #include <fcntl.h>