From bcbfb90897bc446ac1fd0d9423c43bcd425dc878 Mon Sep 17 00:00:00 2001
From: tomch <tomch@b5e51362-a710-0410-a134-be2176fc2e42>
Date: Wed, 4 Apr 2007 21:49:04 +0000
Subject: [PATCH] Fixed cock-up on resolving conflict in previous revision.
 Grr!

---
 AppleWin/source/Disk.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/AppleWin/source/Disk.cpp b/AppleWin/source/Disk.cpp
index 688f12de..e2264dd9 100644
--- a/AppleWin/source/Disk.cpp
+++ b/AppleWin/source/Disk.cpp
@@ -31,13 +31,12 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #define LOG_DISK_ENABLED 1
 
-#ifndef _VC71
-#if LOG_DISK_ENABLED
-// __VA_ARGS__ not supported on MSVC++ .NET 7.x
-    #define LOG_DISK(format, params) LOG(format, params)
-#else
-    #define LOG_DISK(format, params)
-#endif
+#ifndef _VC71	// __VA_ARGS__ not supported on MSVC++ .NET 7.x
+	#if LOG_DISK_ENABLED
+		#define LOG_DISK(format, ...) LOG(format, __VA_ARGS__)
+	#else
+		#define LOG_DISK(...)
+	#endif
 #endif
 
 // Public _________________________________________________________________________________________