[PATCH 09/44] Warning fixes in glx

[Keith Packard]

Signed-off-by: Keith Packard <keithp at keithp.com>
---
 glx/glxdri2.c                | 2 +-
 glx/glxdricommon.c           | 2 +-
 glx/indirect_dispatch.c      | 1 +
 glx/indirect_dispatch_swap.c | 3 +++
 glx/indirect_program.c       | 2 ++
 5 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/glx/glxdri2.c b/glx/glxdri2.c
index b2f3d6e..985f144 100644
--- a/glx/glxdri2.c
+++ b/glx/glxdri2.c
@@ -500,7 +500,7 @@ create_driver_context(__GLXDRIcontext * context,
         unsigned dri_err = 0;
         unsigned major_ver;
         unsigned minor_ver;
-        uint32_t flags;
+        uint32_t flags = 0;
         int reset;
         int api = __DRI_API_OPENGL;
 
diff --git a/glx/glxdricommon.c b/glx/glxdricommon.c
index fc90272..69d4b29 100644
--- a/glx/glxdricommon.c
+++ b/glx/glxdricommon.c
@@ -226,7 +226,7 @@ glxConvertConfigs(const __DRIcoreExtension * core,
     }
 
     for (i = 0; configs[i]; i++) {
-        int renderType = 0;
+        unsigned int renderType = 0;
         if (core->getConfigAttrib(configs[i], __DRI_ATTRIB_RENDER_TYPE,
                                   &renderType)) {
             if (render_type_is_pbuffer_only(renderType) &&
diff --git a/glx/indirect_dispatch.c b/glx/indirect_dispatch.c
index 329b2e6..7086a9f 100644
--- a/glx/indirect_dispatch.c
+++ b/glx/indirect_dispatch.c
@@ -25,6 +25,7 @@
  * SOFTWARE.
  */
 
+#define NO_REALLY_GLX_PROTOTYPES
 #include <inttypes.h>
 #include "glxserver.h"
 #include "indirect_size.h"
diff --git a/glx/indirect_dispatch_swap.c b/glx/indirect_dispatch_swap.c
index 647d0c9..3ffc010 100644
--- a/glx/indirect_dispatch_swap.c
+++ b/glx/indirect_dispatch_swap.c
@@ -25,6 +25,7 @@
  * SOFTWARE.
  */
 
+#define NO_REALLY_GLX_PROTOTYPES
 #include <inttypes.h>
 #include "glxserver.h"
 #include "indirect_size.h"
@@ -81,6 +82,7 @@ bswap_ENUM(const void *src)
     return x.ret;
 }
 
+#if 0
 static GLsync
 bswap_CARD64(const void *src)
 {
@@ -92,6 +94,7 @@ bswap_CARD64(const void *src)
     x.dst = bswap_64(*(uint64_t *) src);
     return x.ret;
 }
+#endif
 
 static GLdouble
 bswap_FLOAT64(const void *src)
diff --git a/glx/indirect_program.c b/glx/indirect_program.c
index fa4a240..6ce52e7 100644
--- a/glx/indirect_program.c
+++ b/glx/indirect_program.c
@@ -123,6 +123,7 @@ __glXDispSwap_GetProgramStringARB(struct __GLXclientStateRec *cl, GLbyte * pc)
     return DoGetProgramString(cl, pc, get_program, get_program_string, True);
 }
 
+#if 0
 int
 __glXDisp_GetProgramStringNV(struct __GLXclientStateRec *cl, GLbyte * pc)
 {
@@ -144,3 +145,4 @@ __glXDispSwap_GetProgramStringNV(struct __GLXclientStateRec *cl, GLbyte * pc)
 
     return DoGetProgramString(cl, pc, get_program, get_program_string, True);
 }
+#endif
-- 
1.8.4.4