[Scummvm-cvs-logs] CVS: scummvm/common/scaler intern.h,1.5,1.6

[Jamieson Christian]

Update of /cvsroot/scummvm/scummvm/common/scaler
In directory sc8-pr-cvs1:/tmp/cvs-serv23966/common/scaler

Modified Files:
	intern.h 
Log Message:
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.

Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/common/scaler/intern.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- intern.h	1 Oct 2003 17:06:36 -0000	1.5
+++ intern.h	2 Oct 2003 15:00:36 -0000	1.6
@@ -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 @@
 #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
@@ -170,5 +170,16 @@
 		else \
 			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