diff options
| author | marha <marha@users.sourceforge.net> | 2010-05-05 09:43:03 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-05-05 09:43:03 +0000 |
| commit | 0874ae23a16946781dd517cfdb011c691ad0b581 (patch) | |
| tree | 8de31864935e96a5e59b9fe6ceb12390bbc474cd /xorg-server/hw/xquartz/GL | |
| parent | d059ebdcb012228102f0b64f8cddf9464d5b625a (diff) | |
| download | vcxsrv-0874ae23a16946781dd517cfdb011c691ad0b581.tar.gz vcxsrv-0874ae23a16946781dd517cfdb011c691ad0b581.tar.bz2 vcxsrv-0874ae23a16946781dd517cfdb011c691ad0b581.zip | |
svn merge -r571:HEAD "^/branches/released" .
Diffstat (limited to 'xorg-server/hw/xquartz/GL')
| -rw-r--r-- | xorg-server/hw/xquartz/GL/indirect.c | 2 | ||||
| -rw-r--r-- | xorg-server/hw/xquartz/GL/visualConfigs.c | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/xorg-server/hw/xquartz/GL/indirect.c b/xorg-server/hw/xquartz/GL/indirect.c index 70558ed20..ad9ebbdac 100644 --- a/xorg-server/hw/xquartz/GL/indirect.c +++ b/xorg-server/hw/xquartz/GL/indirect.c @@ -42,6 +42,8 @@ #define GL_GLEXT_WUNDEF_SUPPORT #include <OpenGL/OpenGL.h> +#include <OpenGL/gl.h> +#include <OpenGL/glext.h> #include <OpenGL/CGLContext.h> /* These next few GL_EXT pre-processing blocks are to explicitly define diff --git a/xorg-server/hw/xquartz/GL/visualConfigs.c b/xorg-server/hw/xquartz/GL/visualConfigs.c index bef27f048..cecc90265 100644 --- a/xorg-server/hw/xquartz/GL/visualConfigs.c +++ b/xorg-server/hw/xquartz/GL/visualConfigs.c @@ -35,9 +35,10 @@ #include "dri.h" #include <OpenGL/OpenGL.h> +#include <OpenGL/gl.h> +#include <OpenGL/glext.h> #include <OpenGL/CGLContext.h> -#include <GL/gl.h> #include <GL/glxproto.h> #include <windowstr.h> #include <resource.h> |