xserver: Branch 'master'

[Keith Packard]

 glx/glxserver.h |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit 8aa6d49d46dacc31a85023d0159c1fb67401df73
Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Wed Jul 4 15:21:01 2012 -0700

    glx: Don't request prototypes for GL extension functions
    
    The server does not want GL extension prototypes.  It never links with
    anything that could possibly provide implementations of these functions.  It
    *is* the provide, and it does not provde these symbols.  All this does is
    create hundreds of warnings like:
    
    incude/GL/glext.h:5570:45: warning: redundant redeclaration of 'glMultTransposeMatrixd' [-Wredundant-decls]
    include/GL/gl.h:1940:45: note: previous declaration of 'glMultTransposeMatrixd' was here
    
    I believe this was necessary back before the AIGLX days, but that was a long,
    long time ago.  The warnings recently showed up with the addition of
    -Wredundant-decls to the CWARNFLAGS.
    
    v2: Update the commit message, no code changes.
    
    Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
    Cc: Adam Jackson <ajax at redhat.com>
    Cc: Dave Airlie <airlied at redhat.com>
    Acked-by: Keith Packard <keithp at keithp.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/glx/glxserver.h b/glx/glxserver.h
index 87c94d9..24e3d62 100644
--- a/glx/glxserver.h
+++ b/glx/glxserver.h
@@ -46,7 +46,6 @@
 #include <resource.h>
 #include <scrnintstr.h>
 
-#define GL_GLEXT_PROTOTYPES     /* we want prototypes */
 #include <GL/gl.h>
 #include <GL/glxproto.h>