diff options
| author | marha <marha@users.sourceforge.net> | 2009-09-24 16:26:20 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2009-09-24 16:26:20 +0000 |
| commit | 82967ab5e087a2fdfcb984f990ba117da68a5b60 (patch) | |
| tree | 52ca72e09a0d1d0ecacfb51a8b0b5d1c8193449c /xorg-server/hw/kdrive | |
| parent | f02db4f3b9d748e1fd06e3ae2985b9cf1547cc7e (diff) | |
| parent | 67b353c9ce039b254ba2e92cd6f842c505a8bd21 (diff) | |
| download | vcxsrv-82967ab5e087a2fdfcb984f990ba117da68a5b60.tar.gz vcxsrv-82967ab5e087a2fdfcb984f990ba117da68a5b60.tar.bz2 vcxsrv-82967ab5e087a2fdfcb984f990ba117da68a5b60.zip | |
svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released
Diffstat (limited to 'xorg-server/hw/kdrive')
| -rw-r--r-- | xorg-server/hw/kdrive/ephyr/XF86dri.c | 2 | ||||
| -rw-r--r-- | xorg-server/hw/kdrive/ephyr/Xephyr.man.pre | 2 | ||||
| -rw-r--r-- | xorg-server/hw/kdrive/ephyr/ephyrdriext.c | 10 |
3 files changed, 7 insertions, 7 deletions
diff --git a/xorg-server/hw/kdrive/ephyr/XF86dri.c b/xorg-server/hw/kdrive/ephyr/XF86dri.c index e94a7f0f0..08123d35c 100644 --- a/xorg-server/hw/kdrive/ephyr/XF86dri.c +++ b/xorg-server/hw/kdrive/ephyr/XF86dri.c @@ -63,7 +63,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include <X11/extensions/extutil.h> #include <GL/glx.h> #include "xf86dri.h" -#include <X11/dri/xf86dristr.h> +#include <X11/dri/xf86driproto.h> static XExtensionInfo _xf86dri_info_data; static XExtensionInfo *xf86dri_info = &_xf86dri_info_data; diff --git a/xorg-server/hw/kdrive/ephyr/Xephyr.man.pre b/xorg-server/hw/kdrive/ephyr/Xephyr.man.pre index f5e8b984d..008256914 100644 --- a/xorg-server/hw/kdrive/ephyr/Xephyr.man.pre +++ b/xorg-server/hw/kdrive/ephyr/Xephyr.man.pre @@ -23,7 +23,7 @@ Xephyr - X server outputting to a window on a pre-existing X display .IR ... ] .SH DESCRIPTION .B Xephyr -is a a kdrive server that outputs to a window on a pre-existing "host" +is a kdrive server that outputs to a window on a pre-existing "host" X display. Think .I Xnest diff --git a/xorg-server/hw/kdrive/ephyr/ephyrdriext.c b/xorg-server/hw/kdrive/ephyr/ephyrdriext.c index 84885d8f0..231b0985c 100644 --- a/xorg-server/hw/kdrive/ephyr/ephyrdriext.c +++ b/xorg-server/hw/kdrive/ephyr/ephyrdriext.c @@ -38,7 +38,7 @@ #include <X11/Xproto.h> #define _XF86DRI_SERVER_ #include <X11/dri/xf86dri.h> -#include <X11/dri/xf86dristr.h> +#include <X11/dri/xf86driproto.h> #include "misc.h" #include "privates.h" #include "dixstruct.h" @@ -54,7 +54,7 @@ #include "hostx.h" #define _HAVE_XALLOC_DECLS #include "ephyrlog.h" - +#include "protocol-versions.h" typedef struct { int foo; @@ -622,9 +622,9 @@ ProcXF86DRIQueryVersion (register ClientPtr client) rep.type = X_Reply; rep.length = 0; rep.sequenceNumber = client->sequence; - rep.majorVersion = XF86DRI_MAJOR_VERSION; - rep.minorVersion = XF86DRI_MINOR_VERSION; - rep.patchVersion = XF86DRI_PATCH_VERSION; + rep.majorVersion = SERVER_XF86DRI_MAJOR_VERSION; + rep.minorVersion = SERVER_XF86DRI_MINOR_VERSION; + rep.patchVersion = SERVER_XF86DRI_PATCH_VERSION; if (client->swapped) { swaps(&rep.sequenceNumber, n); swapl(&rep.length, n); |