aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/xwin/swrastwgl_dri
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-11-08 11:47:30 +0100
committermarha <marha@users.sourceforge.net>2013-11-08 11:47:30 +0100
commitc8483dc2831dc37d93a36804022f6b064f5962ea (patch)
tree599f145a848e10b75a1a8c314ed9c51031446506 /xorg-server/hw/xwin/swrastwgl_dri
parentc97d11aec40d8fa07d6b456bf8694133a77d35f4 (diff)
downloadvcxsrv-c8483dc2831dc37d93a36804022f6b064f5962ea.tar.gz
vcxsrv-c8483dc2831dc37d93a36804022f6b064f5962ea.tar.bz2
vcxsrv-c8483dc2831dc37d93a36804022f6b064f5962ea.zip
Solved compilation and link problems after last merge
Diffstat (limited to 'xorg-server/hw/xwin/swrastwgl_dri')
-rwxr-xr-x[-rw-r--r--]xorg-server/hw/xwin/swrastwgl_dri/glwrap.c2
-rwxr-xr-x[-rw-r--r--]xorg-server/hw/xwin/swrastwgl_dri/makefile0
-rwxr-xr-x[-rw-r--r--]xorg-server/hw/xwin/swrastwgl_dri/swrastwgl_dri.c0
3 files changed, 2 insertions, 0 deletions
diff --git a/xorg-server/hw/xwin/swrastwgl_dri/glwrap.c b/xorg-server/hw/xwin/swrastwgl_dri/glwrap.c
index 3f8e2091b..6d794b671 100644..100755
--- 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
index 201f2aeb9..201f2aeb9 100644..100755
--- a/xorg-server/hw/xwin/swrastwgl_dri/makefile
+++ b/xorg-server/hw/xwin/swrastwgl_dri/makefile
diff --git a/xorg-server/hw/xwin/swrastwgl_dri/swrastwgl_dri.c b/xorg-server/hw/xwin/swrastwgl_dri/swrastwgl_dri.c
index 8597e5b4a..8597e5b4a 100644..100755
--- a/xorg-server/hw/xwin/swrastwgl_dri/swrastwgl_dri.c
+++ b/xorg-server/hw/xwin/swrastwgl_dri/swrastwgl_dri.c