mingw changes (Nolan Leake)

diff --git a/src/mesa/drivers/windows/gdi/wgl.c b/src/mesa/drivers/windows/gdi/wgl.c
index 7f7937c77d8cab5b02cb0fad99d5711313cfc52b..fcb24235e88257884687c6394d00d92c69266e37 100644 (file)
--- a/src/mesa/drivers/windows/gdi/wgl.c
+++ b/src/mesa/drivers/windows/gdi/wgl.c
@@ -1,4 +1,4 @@
-/* $Id: wgl.c,v 1.7 2005/05/24 21:12:43 kschultz Exp $ */
+/* $Id: wgl.c,v 1.8 2005/06/13 14:07:15 brianp Exp $ */
 
 /*
  * This library is free software; you can redistribute it and/or
@@ -35,9 +35,10 @@
 #define _GDI32_
 #include <windows.h>
 
-#include "wmesadef.h"   /* headers for Mesa Windows driver source code */
 #include "GL/wmesa.h"   /* protos for wmesa* functions */
 
+typedef struct wmesa_context *PWMC;
+
 /*
  * Pixel Format Descriptors
  */

diff --git a/src/mesa/drivers/windows/icd/icd.c b/src/mesa/drivers/windows/icd/icd.c
index 969f530be3626fb9dac96ff6b58fced9c7c88a4a..4bc6176b1a9cb56e12def0b79ac1b7c776c5fab4 100644 (file)
--- a/src/mesa/drivers/windows/icd/icd.c
+++ b/src/mesa/drivers/windows/icd/icd.c
@@ -45,13 +45,13 @@ extern "C" {
 
 #include <stdio.h>
 #include <tchar.h>
-#include "../gdi/wmesadef.h"
 #include "GL/wmesa.h"
 #include "mtypes.h"
 #include "glapi.h"
 
 #define MAX_MESA_ATTRS 20
 
+typedef struct wmesa_context *PWMC;
 
 typedef struct _icdTable {
     DWORD size;

diff --git a/src/mesa/drivers/windows/icd/mesa.def b/src/mesa/drivers/windows/icd/mesa.def
index 263b9d484018ca707adc8f0b6bc3534cfddd6b33..1826192d307741f796d1026a53d2ad0f2cdd90be 100644 (file)
--- a/src/mesa/drivers/windows/icd/mesa.def
+++ b/src/mesa/drivers/windows/icd/mesa.def
@@ -76,7 +76,6 @@ EXPORTS
        _mesa_test_proxy_teximage
        _mesa_Viewport
        _swrast_Accum
-       _swrast_alloc_buffers
        _swrast_Bitmap
        _swrast_CopyPixels
        _swrast_DrawBuffer
@@ -98,7 +97,6 @@ EXPORTS
        _swrast_DestroyContext
        _swrast_InvalidateState
        _swrast_ReadPixels
-       _swrast_zbuffer_address
        _swsetup_Wakeup
        _swsetup_CreateContext
        _swsetup_DestroyContext

diff --git a/src/mesa/main/glheader.h b/src/mesa/main/glheader.h
index f8ea238f42eecac5c02605ab4c6ae4e8d1ece57a..abb858638eba4ed67bf34edda49759269dd7c455 100644 (file)
--- a/src/mesa/main/glheader.h
+++ b/src/mesa/main/glheader.h
@@ -81,6 +81,9 @@
 #if _MSC_VER == 1200
 typedef UINT_PTR uintptr_t;
 #endif 
+#if defined(__MINGW32__)
+#include <stdint.h>
+#endif
 #else
 #include <inttypes.h>
 #endif