Solved compilation and link problems after last merge

3 files changed, 4 insertions, 2 deletions

diff --git a/xorg-server/hw/xwin/glx/glwrap.c b/xorg-server/hw/xwin/glx/glwrap.c
index 4d2b77343..9733e7526 100644..100755
--- 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
index 85977cc70..495e366ca 100644..100755
--- 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
index 3b0413312..3b0413312 100644..100755
--- a/xorg-server/hw/xwin/glx/makefile
+++ b/xorg-server/hw/xwin/glx/makefile