From d1d04c7bd3f1465b7bb6690022d086c6bb005b70 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 23 Dec 2011 15:22:40 +0100
Subject: Synchronised files

---
 xorg-server/dix/registry.c |  4 ++--
 xorg-server/glx/glapi.h    | 12 +++++++++++-
 2 files changed, 13 insertions(+), 3 deletions(-)

(limited to 'xorg-server')

diff --git a/xorg-server/dix/registry.c b/xorg-server/dix/registry.c
index aa2edf3e8..319973920 100644
--- a/xorg-server/dix/registry.c
+++ b/xorg-server/dix/registry.c
@@ -204,7 +204,7 @@ RegisterResourceName(RESTYPE resource, const char *name)
     resource &= TypeMask;
 
     while (resource >= nresource) {
-	if (!double_size(&resources, nresource, sizeof(char *)))
+	if (!double_size((void*)&resources, nresource, sizeof(char *)))
 	    return;
 	nresource = nresource ? nresource * 2 : BASE_SIZE;
     }
@@ -300,7 +300,7 @@ dixResetRegistry(void)
 	free(errors[nerror]);
     free(errors);
 
-    free(resources);
+    free((void*)resources);
 
     requests = NULL;
     nminor = NULL;
diff --git a/xorg-server/glx/glapi.h b/xorg-server/glx/glapi.h
index 39b209fe1..f0955fce4 100644
--- a/xorg-server/glx/glapi.h
+++ b/xorg-server/glx/glapi.h
@@ -44,6 +44,13 @@
 #ifndef _GLAPI_H
 #define _GLAPI_H
 
+#include "glapi/glthread.h"
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #ifdef _GLAPI_NO_EXPORTS
 #  define _GLAPI_EXPORT
 #else /* _GLAPI_NO_EXPORTS */
@@ -81,7 +88,6 @@ typedef void (*_glapi_warning_func)(void *ctx, const char *str, ...);
 #define _glapi_Dispatch _mglapi_Dispatch
 #endif
 
-
 /*
  * Number of extension functions which we can dynamically add at runtime.
  */
@@ -178,3 +184,7 @@ extern struct _glapi_table *
 _glapi_create_table_from_handle(void *handle, const char *symbol_prefix);
 
 #endif
+
+#ifdef __cplusplus
+}
+#endif
-- 
cgit v1.2.3