From cd8b0d0de3fcb53f6d3ece8ce26d97aaab2c0914 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Wed, 12 Mar 2014 16:40:50 +0100
Subject: mesa xserver xkbcomp git update 12 Mar 2014

xserver          commit 81a4952d3dcab9ca3a1ee399c773f5ac352036c4
xkbcomp          commit d4e02a09258063c6d024c3ccd42d6b22212e6e18
mesa             commit 2c886eba7820f7e3e965dd16b786b0a412d8ef11
---
 mesalib/src/mapi/glapi/gen/ARB_robustness.xml | 8 ++++----
 mesalib/src/mapi/glapi/gen/glapi_gen.mk       | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'mesalib/src/mapi')

diff --git a/mesalib/src/mapi/glapi/gen/ARB_robustness.xml b/mesalib/src/mapi/glapi/gen/ARB_robustness.xml
index 14048bf49..65843149c 100644
--- a/mesalib/src/mapi/glapi/gen/ARB_robustness.xml
+++ b/mesalib/src/mapi/glapi/gen/ARB_robustness.xml
@@ -152,28 +152,28 @@
 
 <!-- OpenGL 2.0 sized buffer queries -->
     <function name="GetnUniformfvARB" offset="assign">
-        <param name="program" type="GLhandleARB"/>
+        <param name="program" type="GLuint"/>
         <param name="location" type="GLint"/>
         <param name="bufSize" type="GLsizei"/>
         <param name="params" type="GLfloat *" output="true"/>
     </function>
 
     <function name="GetnUniformivARB" offset="assign">
-        <param name="program" type="GLhandleARB"/>
+        <param name="program" type="GLuint"/>
         <param name="location" type="GLint"/>
         <param name="bufSize" type="GLsizei"/>
         <param name="params" type="GLint *" output="true"/>
     </function>
 
     <function name="GetnUniformuivARB" offset="assign">
-        <param name="program" type="GLhandleARB"/>
+        <param name="program" type="GLuint"/>
         <param name="location" type="GLint"/>
         <param name="bufSize" type="GLsizei"/>
         <param name="params" type="GLuint *" output="true"/>
     </function>
 
     <function name="GetnUniformdvARB" offset="assign">
-        <param name="program" type="GLhandleARB"/>
+        <param name="program" type="GLuint"/>
         <param name="location" type="GLint"/>
         <param name="bufSize" type="GLsizei"/>
         <param name="params" type="GLdouble *" output="true"/>
diff --git a/mesalib/src/mapi/glapi/gen/glapi_gen.mk b/mesalib/src/mapi/glapi/gen/glapi_gen.mk
index 242ae5fd9..b8bb2f465 100644
--- a/mesalib/src/mapi/glapi/gen/glapi_gen.mk
+++ b/mesalib/src/mapi/glapi/gen/glapi_gen.mk
@@ -12,7 +12,7 @@ glapi_gen_mapi_deps := \
 # $(1): path to an XML file
 # $(2): name of the printer
 define glapi_gen_mapi
-@mkdir -p $(dir $@)
+@$(MKDIR_P) $(dir $@)
 $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS) $(glapi_gen_mapi_script) \
 	--mode lib --printer $(2) $(1) > $@
 endef
@@ -23,7 +23,7 @@ glapi_gen_dispatch_deps := $(glapi_gen_common_deps)
 # $(1): path to an XML file
 # $(2): empty, es1, or es2 for entry point filtering
 define glapi_gen_dispatch
-@mkdir -p $(dir $@)
+@$(MKDIR_P) $(dir $@)
 $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS) $(glapi_gen_dispatch_script) \
 	-f $(1) -m remap_table $(if $(2),-c $(2),) > $@
 endef
@@ -34,7 +34,7 @@ glapi_gen_remap_deps := $(glapi_gen_common_deps)
 # $(1): path to an XML file
 # $(2): empty, es1, or es2 for entry point filtering
 define glapi_gen_remap
-@mkdir -p $(dir $@)
+@$(MKDIR_P) $(dir $@)
 $(AM_V_GEN)$(PYTHON2) $(PYTHON_FLAGS) $(glapi_gen_remap_script) \
 	-f $(1) $(if $(2),-c $(2),) > $@
 endef
-- 
cgit v1.2.3