From c8483dc2831dc37d93a36804022f6b064f5962ea Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 8 Nov 2013 11:47:30 +0100
Subject: Solved compilation and link problems after last merge

---
 xorg-server/hw/xwin/glx/glwrap.c                  | 2 ++
 xorg-server/hw/xwin/glx/indirect.c                | 4 ++--
 xorg-server/hw/xwin/glx/makefile                  | 0
 xorg-server/hw/xwin/swrastwgl_dri/glwrap.c        | 2 ++
 xorg-server/hw/xwin/swrastwgl_dri/makefile        | 0
 xorg-server/hw/xwin/swrastwgl_dri/swrastwgl_dri.c | 0
 6 files changed, 6 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 xorg-server/hw/xwin/glx/glwrap.c
 mode change 100644 => 100755 xorg-server/hw/xwin/glx/indirect.c
 mode change 100644 => 100755 xorg-server/hw/xwin/glx/makefile
 mode change 100644 => 100755 xorg-server/hw/xwin/swrastwgl_dri/glwrap.c
 mode change 100644 => 100755 xorg-server/hw/xwin/swrastwgl_dri/makefile
 mode change 100644 => 100755 xorg-server/hw/xwin/swrastwgl_dri/swrastwgl_dri.c

(limited to 'xorg-server/hw')

diff --git a/xorg-server/hw/xwin/glx/glwrap.c b/xorg-server/hw/xwin/glx/glwrap.c
old mode 100644
new mode 100755
index 4d2b77343..9733e7526
--- a/xorg-server/hw/xwin/glx/glwrap.c
+++ b/xorg-server/hw/xwin/glx/glwrap.c
@@ -42,6 +42,8 @@
 #include <glx/glheader.h>
 #include <glx/glxserver.h>
 #include <glx/glxext.h>
+#include <glx/glapi.h>
+#include <glx/dispatch.h>
 #include <glwindows.h>
 #include <winmsg.h>
 
diff --git a/xorg-server/hw/xwin/glx/indirect.c b/xorg-server/hw/xwin/glx/indirect.c
old mode 100644
new mode 100755
index 85977cc70..495e366ca
--- a/xorg-server/hw/xwin/glx/indirect.c
+++ b/xorg-server/hw/xwin/glx/indirect.c
@@ -85,6 +85,8 @@
 #include <glx/extension_string.h>
 #include <glx/glxext.h>
 #include <GL/glxtokens.h>
+#include <glx/glapitable.h>
+#include <glx/glapi.h>
 
 #include <winpriv.h>
 #include <wgl_ext_api.h>
@@ -1800,10 +1802,8 @@ glxWinCreateContext(__GLXscreen * screen,
     //context->ctx = NULL; already done with memset
     context->shareContext = shareContext;
 
-/* TODO how to handle the unknown type glapi_table???
     context->Dispatch=calloc(sizeof(void*), (sizeof(struct _glapi_table) / sizeof(void *) + MAX_EXTENSION_FUNCS));
     _glapi_set_dispatch(context->Dispatch);
-*/
 
     glWinSetupDispatchTable();
 
diff --git a/xorg-server/hw/xwin/glx/makefile b/xorg-server/hw/xwin/glx/makefile
old mode 100644
new mode 100755
diff --git a/xorg-server/hw/xwin/swrastwgl_dri/glwrap.c b/xorg-server/hw/xwin/swrastwgl_dri/glwrap.c
old mode 100644
new mode 100755
index 3f8e2091b..6d794b671
--- a/xorg-server/hw/xwin/swrastwgl_dri/glwrap.c
+++ b/xorg-server/hw/xwin/swrastwgl_dri/glwrap.c
@@ -42,6 +42,8 @@
 #include <glx/glheader.h>
 #include <glx/glxserver.h>
 #include <glx/glxext.h>
+#include <glx/glapi.h>
+#include <glx/dispatch.h>
 #include <glwindows.h>
 #include <winmsg.h>
 
diff --git a/xorg-server/hw/xwin/swrastwgl_dri/makefile b/xorg-server/hw/xwin/swrastwgl_dri/makefile
old mode 100644
new mode 100755
diff --git a/xorg-server/hw/xwin/swrastwgl_dri/swrastwgl_dri.c b/xorg-server/hw/xwin/swrastwgl_dri/swrastwgl_dri.c
old mode 100644
new mode 100755
-- 
cgit v1.2.3