From: Brian Paul <brianp@vmware.com>
Date: Fri, 14 Oct 2016 15:18:18 +0000 (-0600)
Subject: vbo: minor clean-up in vbo_exec_api.c
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8320bf1a7e6b41550a8f5160d9d74f628aa9d82f;p=mesa.git

vbo: minor clean-up in vbo_exec_api.c

Reviewed-by: Charmaine Lee <charmainel@vmware.com>
---

diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c
index b191a94c8c3..895f19745c8 100644
--- a/src/mesa/vbo/vbo_exec_api.c
+++ b/src/mesa/vbo/vbo_exec_api.c
@@ -48,11 +48,6 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "vbo_noop.h"
 
 
-#ifdef ERROR
-#undef ERROR
-#endif
-
-
 /** ID/name for immediate-mode VBO */
 #define IMM_BUFFER_NAME 0xaabbccdd
 
@@ -514,6 +509,8 @@ do {									\
    }                                                                    \
 } while (0)
 
+
+#undef ERROR
 #define ERROR(err) _mesa_error( ctx, err, __func__ )
 #define TAG(x) vbo_##x