xserver: Branch 'master' - 2 commits

[Eric Anholt]

 glx/indirect_program.c |    2 +-
 glx/render2.c          |    5 -----
 glx/render2swap.c      |    5 -----
 3 files changed, 1 insertion(+), 11 deletions(-)

New commits:
commit 49d38ab2328c409b2a98465b52677af057121513
Author: Eric Anholt <eric at anholt.net>
Date:   Tue Dec 2 15:09:57 2008 -0800

    Warning fix: Remove dead glXDisp{,Swap}_DrawArraysEXT definitions.
    
    Signed-off-by: Eric Anholt <eric at anholt.net>
    Acked-by: Ian Romanick <ian.d.romanick at intel.com>

diff --git a/glx/render2.c b/glx/render2.c
index eca6222..eb7c30b 100644
--- a/glx/render2.c
+++ b/glx/render2.c
@@ -251,8 +251,3 @@ void __glXDisp_DrawArrays(GLbyte *pc)
     CALL_DisableClientState( GET_DISPATCH(), (GL_SECONDARY_COLOR_ARRAY) );
     CALL_DisableClientState( GET_DISPATCH(), (GL_FOG_COORD_ARRAY) );
 }
-
-void __glXDisp_DrawArraysEXT(GLbyte *pc)
-{
-   __glXDisp_DrawArrays(pc);
-}
diff --git a/glx/render2swap.c b/glx/render2swap.c
index acfb828..17354c4 100644
--- a/glx/render2swap.c
+++ b/glx/render2swap.c
@@ -362,8 +362,3 @@ void __glXDispSwap_DrawArrays(GLbyte *pc)
     CALL_DisableClientState( GET_DISPATCH(), (GL_SECONDARY_COLOR_ARRAY) );
     CALL_DisableClientState( GET_DISPATCH(), (GL_FOG_COORD_ARRAY) );
 }
-
-void __glXDispSwap_DrawArraysEXT(GLbyte *pc)
-{
-   __glXDispSwap_DrawArrays(pc);
-}
commit 2c5bfffc832e3818bbf0c0a96522865ce1ef2653
Author: Eric Anholt <eric at anholt.net>
Date:   Tue Dec 2 14:59:04 2008 -0800

    Warning fix (GL likes to call strings GLubyte * instead of char *).
    
    Signed-off-by: Eric Anholt <eric at anholt.net>
    Acked-by: Ian Romanick <ian.d.romanick at intel.com>

diff --git a/glx/indirect_program.c b/glx/indirect_program.c
index a206f90..237da29 100644
--- a/glx/indirect_program.c
+++ b/glx/indirect_program.c
@@ -102,7 +102,7 @@ int DoGetProgramString(struct __GLXclientStateRec *cl, GLbyte *pc,
 	    CALL_by_offset(GET_DISPATCH(), 
 			   (void (GLAPIENTRYP)(GLuint, GLenum, GLubyte *)),
 			   get_program_string_offset,
-			   (target, pname, answer));
+			   (target, pname, (GLubyte *)answer));
 	}
 
 	if (__glXErrorOccured()) {