diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-08 11:47:30 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-08 11:47:30 +0100 |
| commit | c8483dc2831dc37d93a36804022f6b064f5962ea (patch) | |
| tree | 599f145a848e10b75a1a8c314ed9c51031446506 /xorg-server/present/present_request.c | |
| parent | c97d11aec40d8fa07d6b456bf8694133a77d35f4 (diff) | |
| download | vcxsrv-c8483dc2831dc37d93a36804022f6b064f5962ea.tar.gz vcxsrv-c8483dc2831dc37d93a36804022f6b064f5962ea.tar.bz2 vcxsrv-c8483dc2831dc37d93a36804022f6b064f5962ea.zip | |
Solved compilation and link problems after last merge
Diffstat (limited to 'xorg-server/present/present_request.c')
| -rw-r--r-- | xorg-server/present/present_request.c | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/xorg-server/present/present_request.c b/xorg-server/present/present_request.c index 095fa2daf..cd2d334ff 100644 --- a/xorg-server/present/present_request.c +++ b/xorg-server/present/present_request.c @@ -20,8 +20,8 @@ * OF THIS SOFTWARE. */ -#ifdef HAVE_XORG_CONFIG_H -#include <xorg-config.h> +#ifdef HAVE_DIX_CONFIG_H +#include <dix-config.h> #endif #include "present_priv.h" @@ -30,14 +30,14 @@ static int proc_present_query_version(ClientPtr client) { + xPresentQueryVersionReply rep; REQUEST(xPresentQueryVersionReq); - xPresentQueryVersionReply rep = { - .type = X_Reply, - .sequenceNumber = client->sequence, - .length = 0, - .majorVersion = PRESENT_MAJOR, - .minorVersion = PRESENT_MINOR - }; + rep.type = X_Reply; + rep.sequenceNumber = client->sequence; + rep.length = 0; + rep.majorVersion = PRESENT_MAJOR; + rep.minorVersion = PRESENT_MINOR; + REQUEST_SIZE_MATCH(xPresentQueryVersionReq); (void) stuff; @@ -199,15 +199,14 @@ proc_present_select_input (ClientPtr client) static int proc_present_query_capabilities (ClientPtr client) { - REQUEST(xPresentQueryCapabilitiesReq); - xPresentQueryCapabilitiesReply rep = { - .type = X_Reply, - .sequenceNumber = client->sequence, - .length = 0, - }; WindowPtr window; RRCrtcPtr crtc = NULL; int r; + xPresentQueryCapabilitiesReply rep; + REQUEST(xPresentQueryCapabilitiesReq); + rep.type = X_Reply; + rep.sequenceNumber = client->sequence; + rep.length = 0; r = dixLookupWindow(&window, stuff->target, client, DixGetAttrAccess); switch (r) { |