summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2005-06-13 14:07:14 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2005-06-13 14:07:14 +0000
commit2d218885ecb0bf82cbfd33da1b9186bf6e09375b (patch)
tree200bf17a947e754c1f36872d1afdea4374012c0c /src/mesa
parent902e70875d421b14195f7fedb8303bb079607dcc (diff)
mingw changes (Nolan Leake)
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/windows/gdi/wgl.c5
-rw-r--r--src/mesa/drivers/windows/icd/icd.c2
-rw-r--r--src/mesa/drivers/windows/icd/mesa.def2
-rw-r--r--src/mesa/main/glheader.h3
4 files changed, 7 insertions, 5 deletions
diff --git a/src/mesa/drivers/windows/gdi/wgl.c b/src/mesa/drivers/windows/gdi/wgl.c
index 7f7937c77d..fcb24235e8 100644
--- 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 969f530be3..4bc6176b1a 100644
--- 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 263b9d4840..1826192d30 100644
--- 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 f8ea238f42..abb858638e 100644
--- 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