Skip to content

N
nx-libs
Commit 3bf35074 authored by Peter Hutterer's avatar Peter Hutterer Committed by Ulrich Sibiller
Browse files
Options

Switch GetEmptyReq and GetResReq to call _XGetRequest

Signed-off-by: 's avatarPeter Hutterer <peter.hutterer@who-t.net> Reviewed-by: 's avatarJamey Sharp <jamey@minilop.net> Backported-to-NX-by: 's avatarUlrich Sibiller <uli42@gmx.de>
parent 3597915f
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 30 deletions
nx-X11/lib/X11/Xlibint.h
View file @ 3bf35074
...@@ -499,24 +499,12 @@ extern void *_XGetRequest(Display *dpy, CARD8 type, size_t len); ...@@ -499,24 +499,12 @@ extern void *_XGetRequest(Display *dpy, CARD8 type, size_t len);
#if !defined(UNIXCPP) || defined(ANSICPP) #if !defined(UNIXCPP) || defined(ANSICPP)
#define GetResReq(name, rid, req) \ #define GetResReq(name, rid, req) \
if ((dpy->bufptr + SIZEOF(xResourceReq)) > dpy->bufmax)\ req = (xResourceReq *) _XGetRequest(dpy, X_##name, SIZEOF(xResourceReq)); \
_XFlush(dpy);\ req->id = (rid)
req = (xResourceReq *) (dpy->last_req = dpy->bufptr);\
req->reqType = X_##name;\
req->length = 2;\
req->id = (rid);\
dpy->bufptr += SIZEOF(xResourceReq);\
dpy->request++
#else #else
#define GetResReq(name, rid, req) \ #define GetResReq(name, rid, req) \
if ((dpy->bufptr + SIZEOF(xResourceReq)) > dpy->bufmax)\ req = (xResourceReq *) _XGetRequest(dpy, X_/**/name, SIZEOF(xResourceReq)); \
_XFlush(dpy);\ req->id = (rid)
req = (xResourceReq *) (dpy->last_req = dpy->bufptr);\
req->reqType = X_/**/name;\
req->length = 2;\
req->id = (rid);\
dpy->bufptr += SIZEOF(xResourceReq);\
dpy->request++
#endif #endif
/* /*
...@@ -525,22 +513,10 @@ extern void *_XGetRequest(Display *dpy, CARD8 type, size_t len); ...@@ -525,22 +513,10 @@ extern void *_XGetRequest(Display *dpy, CARD8 type, size_t len);
*/ */
#if !defined(UNIXCPP) || defined(ANSICPP) #if !defined(UNIXCPP) || defined(ANSICPP)
#define GetEmptyReq(name, req) \ #define GetEmptyReq(name, req) \
if ((dpy->bufptr + SIZEOF(xReq)) > dpy->bufmax)\ req = (xReq *) _XGetRequest(dpy, X_##name, SIZEOF(xReq))
_XFlush(dpy);\
req = (xReq *) (dpy->last_req = dpy->bufptr);\
req->reqType = X_##name;\
req->length = 1;\
dpy->bufptr += SIZEOF(xReq);\
dpy->request++
#else #else
#define GetEmptyReq(name, req) \ #define GetEmptyReq(name, req) \
if ((dpy->bufptr + SIZEOF(xReq)) > dpy->bufmax)\ req = (xReq *) _XGetRequest(dpy, X_/**/name, SIZEOF(xReq))
_XFlush(dpy);\
req = (xReq *) (dpy->last_req = dpy->bufptr);\
req->reqType = X_/**/name;\
req->length = 1;\
dpy->bufptr += SIZEOF(xReq);\
dpy->request++
#endif #endif
/* /*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment