summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/windows/wmesa.c
diff options
context:
space:
mode:
authorKarl Schultz <[email protected]>2002-10-04 15:58:33 +0000
committerKarl Schultz <[email protected]>2002-10-04 15:58:33 +0000
commitf8acbed50d96d35d2a354f1fe7e81594d79a3186 (patch)
tree53a30520fffce4b53ed8a37ea181ccd1c9696ca2 /src/mesa/drivers/windows/wmesa.c
parenta42e7c9172f1c41dd15da739274cb83a827c31a3 (diff)
Fix for bug 618459. Mods to allow compilation on VC++ 5.0 (Michael Krause)
Diffstat (limited to 'src/mesa/drivers/windows/wmesa.c')
-rw-r--r--src/mesa/drivers/windows/wmesa.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/mesa/drivers/windows/wmesa.c b/src/mesa/drivers/windows/wmesa.c
index bd8d8c69d69..05029adbfea 100644
--- a/src/mesa/drivers/windows/wmesa.c
+++ b/src/mesa/drivers/windows/wmesa.c
@@ -1,4 +1,4 @@
-/* $Id: wmesa.c,v 1.36 2002/09/27 02:45:39 brianp Exp $ */
+/* $Id: wmesa.c,v 1.37 2002/10/04 15:58:33 kschultz Exp $ */
/*
* Windows (Win32) device driver for Mesa 3.4
@@ -101,7 +101,13 @@ WMesaContext WC = NULL;
#ifdef COMPILE_SETPIXEL
-__forceinline void wmSetPixel(PWMC pwc, int iScanLine, int iPixel, BYTE r, BYTE g, BYTE b)
+#if defined(_MSC_VER) && _MSC_VER >= 1200
+#define FORCEINLINE __forceinline
+#else
+#define FORCEINLINE __inline
+#endif
+
+FORCEINLINE void wmSetPixel(PWMC pwc, int iScanLine, int iPixel, BYTE r, BYTE g, BYTE b)
{
pwc->wmSetPixel(pwc,iScanLine,iPixel,r,g,b);
}