From 8fbcb4ac151e0e4cf71dd1753901d04615fc20f0 Mon Sep 17 00:00:00 2001
From: Jamieson Christian
Date: Thu, 2 Oct 2003 15:00:36 +0000
Subject: Added MSVC6_COMPAT in order to be able to disable new
 additions/optimizations that use constructs with which MSVC6 is incompatible,
 such as the revamped template-based super/hq/tv scalers.

svn-id: r10540
---
 common/scaler/intern.h | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

(limited to 'common/scaler')

diff --git a/common/scaler/intern.h b/common/scaler/intern.h
index daf76a0d11..982386e54e 100644
--- a/common/scaler/intern.h
+++ b/common/scaler/intern.h
@@ -35,6 +35,9 @@
 //
 #define USE_ALTIVEC	0
 
+// MSVC6 chokes on all but the most simplistic template usage.
+#ifndef MSVC6_COMPAT
+
 template<int bitFormat>
 struct ColorMasks {
 };
@@ -67,9 +70,6 @@ struct ColorMasks<555> {
 #define greenMask	ColorMasks<bitFormat>::greenMask
 
 
-extern int gBitFormat;
-
-
 /**
  * Interpolate two 16 bit pixel pairs at once with equal weights 1.
  * In particular, A and B can contain two pixels/each in the upper
@@ -171,4 +171,15 @@ extern int   RGBtoYUV[65536];
 			FUNC<555>(srcPtr, srcPitch, dstPtr, dstPitch, width, height); \
 	}
 
+#else // MSVC6_COMPAT is defined
+
+#define MAKE_WRAPPER(FUNC) \
+	void FUNC(const uint8 *srcPtr, uint32 srcPitch, uint8 *dstPtr, uint32 dstPitch, int width, int height) { \
+		return; \
+	}
+
+#endif
+
+extern int gBitFormat;
+
 #endif
-- 
cgit v1.2.3