summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/glu/sgi/include/gluos.h4
-rw-r--r--src/mesa/drivers/windows/wmesa.c10
2 files changed, 11 insertions, 3 deletions
diff --git a/src/glu/sgi/include/gluos.h b/src/glu/sgi/include/gluos.h
index f8c80826c7..bfa3338706 100644
--- a/src/glu/sgi/include/gluos.h
+++ b/src/glu/sgi/include/gluos.h
@@ -1,7 +1,7 @@
/*
** gluos.h - operating system dependencies for GLU
**
-** $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/include/gluos.h,v 1.3 2001/07/16 15:46:42 brianp Exp $
+** $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/include/gluos.h,v 1.4 2002/10/04 15:58:33 kschultz Exp $
*/
#ifdef __VMS
#ifdef __cplusplus
@@ -33,7 +33,9 @@
#pragma warning(disable : 4244)
#pragma warning(disable : 4761)
+#if defined(_MSC_VER) && _MSC_VER >= 1200
#pragma comment(linker, "/OPT:NOWIN98")
+#endif
#else
diff --git a/src/mesa/drivers/windows/wmesa.c b/src/mesa/drivers/windows/wmesa.c
index bd8d8c69d6..05029adbfe 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);
}