diff options
| author | marha <marha@users.sourceforge.net> | 2012-11-07 10:08:29 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-11-07 10:08:29 +0100 |
| commit | 74380c2fc1384a529df4f4995bddcf587fbac389 (patch) | |
| tree | 0089fa6c54409e2a9515e0f530bf33e5f9561e29 /xorg-server/hw/xwin/swrastwgl_dri | |
| parent | 2c345c9da4dedfafe791557ca3fcf891ce26249d (diff) | |
| parent | 1738a6973deb03f33a71c9527594727cb8bb64b4 (diff) | |
| download | vcxsrv-74380c2fc1384a529df4f4995bddcf587fbac389.tar.gz vcxsrv-74380c2fc1384a529df4f4995bddcf587fbac389.tar.bz2 vcxsrv-74380c2fc1384a529df4f4995bddcf587fbac389.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
xserver mesa xkbcomp git update 7 nov 2012
Conflicts:
mesalib/src/mapi/glapi/gen/glX_API.xml
mesalib/src/mesa/main/.gitignore
xkbcomp/listing.c
xorg-server/hw/xwin/winshaddd.c
xorg-server/hw/xwin/winshadddnl.c
Diffstat (limited to 'xorg-server/hw/xwin/swrastwgl_dri')
| -rw-r--r-- | xorg-server/hw/xwin/swrastwgl_dri/glwrap.c | 1 | ||||
| -rw-r--r-- | xorg-server/hw/xwin/swrastwgl_dri/swrastwgl_dri.c | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/xorg-server/hw/xwin/swrastwgl_dri/glwrap.c b/xorg-server/hw/xwin/swrastwgl_dri/glwrap.c index d74addb69..6d794b671 100644 --- a/xorg-server/hw/xwin/swrastwgl_dri/glwrap.c +++ b/xorg-server/hw/xwin/swrastwgl_dri/glwrap.c @@ -39,6 +39,7 @@ #include <X11/Xwindows.h> #include <GL/gl.h> #include <GL/glext.h> +#include <glx/glheader.h> #include <glx/glxserver.h> #include <glx/glxext.h> #include <glx/glapi.h> diff --git a/xorg-server/hw/xwin/swrastwgl_dri/swrastwgl_dri.c b/xorg-server/hw/xwin/swrastwgl_dri/swrastwgl_dri.c index c5b799079..8597e5b4a 100644 --- a/xorg-server/hw/xwin/swrastwgl_dri/swrastwgl_dri.c +++ b/xorg-server/hw/xwin/swrastwgl_dri/swrastwgl_dri.c @@ -1,3 +1,6 @@ +#ifdef HAVE_XWIN_CONFIG_H
+#include <xwin-config.h>
+#endif
#include <X11/Xwindows.h>
#include <GL/gl.h>
#include <GL/glext.h>
@@ -5,6 +8,7 @@ #include <GL/internal/dri_interface.h>
#include <stdint.h>
+#include <glx/glheader.h>
#include <glx/glapi.h>
#include <glx/glapitable.h>
@@ -17,6 +21,7 @@ typedef int BOOL; #define PRINTF(...)
#endif
+#undef PUBLIC
#define PUBLIC __declspec(dllexport)
BOOL colorIndexMode = FALSE;
|