3 files changed, 2 insertions, 8 deletions
diff --git a/xorg-server/glx/indirect_size_get.c b/xorg-server/glx/indirect_size_get.c
index 8a574995d..9f0a2d580 100644
--- a/xorg-server/glx/indirect_size_get.c
+++ b/xorg-server/glx/indirect_size_get.c
@@ -901,9 +901,7 @@ __glGetTexLevelParameterfv_size( GLenum e )
         case GL_TEXTURE_INTENSITY_SIZE:
 /*      case GL_TEXTURE_INTENSITY_SIZE_EXT:*/
         case GL_TEXTURE_DEPTH:
-#ifndef _MSC_VER
         case GL_TEXTURE_INDEX_SIZE_EXT:
-#endif
         case GL_TEXTURE_COMPRESSED_IMAGE_SIZE:
 /*      case GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB:*/
         case GL_TEXTURE_COMPRESSED:
diff --git a/xorg-server/glx/makefile b/xorg-server/glx/makefile
index 6146b991c..68426af2b 100644
--- a/xorg-server/glx/makefile
+++ b/xorg-server/glx/makefile
@@ -42,3 +42,5 @@ CSRCS = \
         swap_interval.c \
         xfont.c
 
+INCLUDES := $(MHMAKECONF)\mesalib\include $(INCLUDES)
+
diff --git a/xorg-server/glx/rensize.c b/xorg-server/glx/rensize.c
index 6b85dc116..1dc2407b0 100644
--- a/xorg-server/glx/rensize.c
+++ b/xorg-server/glx/rensize.c
@@ -223,9 +223,7 @@ int __glXImageSize( GLenum format, GLenum type, GLenum target,
 	  case GL_422_AVERAGE_EXT:
 	  case GL_422_REV_AVERAGE_EXT:
 	  case GL_DEPTH_STENCIL_NV:
-#ifndef _MSC_VER
 	  case GL_DEPTH_STENCIL_MESA:
-#endif
 	  case GL_YCBCR_MESA:
 	  case GL_LUMINANCE_ALPHA:
 	    elementsPerGroup = 2;
@@ -264,13 +262,11 @@ int __glXImageSize( GLenum format, GLenum type, GLenum target,
 	  case GL_UNSIGNED_SHORT_1_5_5_5_REV:
 	  case GL_UNSIGNED_SHORT_8_8_APPLE:
 	  case GL_UNSIGNED_SHORT_8_8_REV_APPLE:
-#ifndef _MSC_VER
 	  case GL_UNSIGNED_SHORT_15_1_MESA:
 	  case GL_UNSIGNED_SHORT_1_15_REV_MESA:
 	    bytesPerElement = 2;
 	    elementsPerGroup = 1;
 	    break;
-#endif
 	  case GL_INT:
 	  case GL_UNSIGNED_INT:
 	  case GL_FLOAT:
@@ -281,10 +277,8 @@ int __glXImageSize( GLenum format, GLenum type, GLenum target,
 	  case GL_UNSIGNED_INT_10_10_10_2:
 	  case GL_UNSIGNED_INT_2_10_10_10_REV:
 	  case GL_UNSIGNED_INT_24_8_NV:
-#ifndef _MSC_VER
 	  case GL_UNSIGNED_INT_24_8_MESA:
 	  case GL_UNSIGNED_INT_8_24_REV_MESA:
-#endif
 	    bytesPerElement = 4;
 	    elementsPerGroup = 1;
 	    break;