summaryrefslogtreecommitdiffstats
path: root/src/mesa/vbo
diff options
context:
space:
mode:
authorzhang <[email protected]>2007-06-28 08:12:52 -0600
committerBrian <[email protected]>2007-06-28 08:12:52 -0600
commit37aca21129d87946d2dc6b45fa5bacd514921550 (patch)
tree1fcd114a8bf8aa783dd2c700eb1065828a63f309 /src/mesa/vbo
parentb0b02507b42ca43a7c9d9e9a10c2f49fc6f8d8ba (diff)
a variety of fixes for MingW
Diffstat (limited to 'src/mesa/vbo')
-rw-r--r--src/mesa/vbo/vbo_exec_api.c5
-rw-r--r--src/mesa/vbo/vbo_save_api.c4
2 files changed, 9 insertions, 0 deletions
diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c
index 8d13ef9d081..2d4ded0f984 100644
--- a/src/mesa/vbo/vbo_exec_api.c
+++ b/src/mesa/vbo/vbo_exec_api.c
@@ -43,6 +43,11 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "vbo_context.h"
+#ifdef ERROR
+#undef ERROR
+#endif
+
+
static void reset_attrfv( struct vbo_exec_context *exec );
diff --git a/src/mesa/vbo/vbo_save_api.c b/src/mesa/vbo/vbo_save_api.c
index c08fd1fe555..e7794c2a6cc 100644
--- a/src/mesa/vbo/vbo_save_api.c
+++ b/src/mesa/vbo/vbo_save_api.c
@@ -80,6 +80,10 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
#include "vbo_context.h"
+#ifdef ERROR
+#undef ERROR
+#endif
+
/*
* NOTE: Old 'parity' issue is gone, but copying can still be