diff options
| author | marha <marha@users.sourceforge.net> | 2009-09-24 10:49:08 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-09-24 10:49:08 +0000 |
| commit | 67b353c9ce039b254ba2e92cd6f842c505a8bd21 (patch) | |
| tree | edb5f3ff6a9564a50f3b701913ab2b3aafa80a95 /xorg-server/glx | |
| parent | f3d88db0960f1c23e55f2529764b096ac92d78d9 (diff) | |
| download | vcxsrv-67b353c9ce039b254ba2e92cd6f842c505a8bd21.tar.gz vcxsrv-67b353c9ce039b254ba2e92cd6f842c505a8bd21.tar.bz2 vcxsrv-67b353c9ce039b254ba2e92cd6f842c505a8bd21.zip | |
Update following packages:
- xproto-7.0.16
- libXdmcp-1.0.3
- bdftopcf-1.0.2
- xorg-server-1.6.99.902
Diffstat (limited to 'xorg-server/glx')
| -rw-r--r-- | xorg-server/glx/glxcmds.c | 5 | ||||
| -rw-r--r-- | xorg-server/glx/glxdri.c | 2 | ||||
| -rw-r--r-- | xorg-server/glx/glxserver.h | 4 |
3 files changed, 4 insertions, 7 deletions
diff --git a/xorg-server/glx/glxcmds.c b/xorg-server/glx/glxcmds.c index f5632d162..b1061a8c2 100644 --- a/xorg-server/glx/glxcmds.c +++ b/xorg-server/glx/glxcmds.c @@ -50,6 +50,7 @@ #include "indirect_dispatch.h" #include "indirect_table.h" #include "indirect_util.h" +#include "protocol-versions.h" static int validGlxScreen(ClientPtr client, int screen, __GLXscreen **pGlxScreen, int *err) @@ -738,8 +739,8 @@ int __glXDisp_QueryVersion(__GLXclientState *cl, GLbyte *pc) ** client if it wants to work with older clients; however, in this ** implementation the server just returns its version number. */ - reply.majorVersion = GLX_SERVER_MAJOR_VERSION; - reply.minorVersion = GLX_SERVER_MINOR_VERSION; + reply.majorVersion = SERVER_GLX_MAJOR_VERSION; + reply.minorVersion = SERVER_GLX_MINOR_VERSION; reply.length = 0; reply.type = X_Reply; reply.sequenceNumber = client->sequence; diff --git a/xorg-server/glx/glxdri.c b/xorg-server/glx/glxdri.c index c9d226bdf..6122653b0 100644 --- a/xorg-server/glx/glxdri.c +++ b/xorg-server/glx/glxdri.c @@ -43,7 +43,7 @@ #define _XF86DRI_SERVER_ #include <drm_sarea.h> #include <xf86drm.h> -#include <xf86dristr.h> +#include <X11/dri/xf86driproto.h> #include <xf86str.h> #include <xf86.h> #include <dri.h> diff --git a/xorg-server/glx/glxserver.h b/xorg-server/glx/glxserver.h index 46c938268..4aa8c2eec 100644 --- a/xorg-server/glx/glxserver.h +++ b/xorg-server/glx/glxserver.h @@ -64,10 +64,6 @@ typedef struct __GLXcontext __GLXcontext; #include "glxdrawable.h" #include "glxcontext.h" - -#define GLX_SERVER_MAJOR_VERSION 1 -#define GLX_SERVER_MINOR_VERSION 2 - #ifndef True #define True 1 #endif |