(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.

diff --git a/src/lib/commands/add.c b/src/lib/commands/add.c
index 8a08e918f83eebec4c765472866e350fc7012972..efd99ecb56b764e0a8306c55a0b8de95cb9b5f6f 100644 (file)
--- 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 2ce4d2594ba2b35e4bf87949dc904dac2176185a..2aa9184b836953dfd5592af9b6f9d767d64d6a30 100644 (file)
--- 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 b3d43e2256595226e21f2a01d68cbb1b080c4913..5a15376ae92914a6c5a28e0799eeb8bd80d114db 100644 (file)
--- 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 20b38e69f7830d421a4490f6f01fafae82829cb3..f43dda0b489b009278ee78f16b35675862b36413 100644 (file)
--- 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 8ca2f2b3a401e51822b150edbd9376450d4f86a0..3c1bb65ca6aac6822c0198f47c5215c1838a88b8 100644 (file)
--- 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 723973b7df2ee06a4df851327c81c012ef889221..62628d0d2ccbdce7331eb27b5473085c512b4e3d 100644 (file)
--- 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 970625caf4ca14396a257271d94a086e6c8718e1..91a9432d5cbabae2e1af281d5c277ef663379f9f 100644 (file)
--- 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>