Use GetReqSized for GetReq and GetReqExtra

GetEmptyReq and GetResReq cannot do this due to the final typecast - typically requests that need either of those do not have their own typedef in the protocol headers. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Jamey Sharp <jamey@minilop.net> Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>

Use GetReqSized for GetReq and GetReqExtra
3155b9bb · Peter Hutterer · Ulrich Sibiller · 79cb50e4 · 3155b9bb
Commit 3155b9bb authored Oct 27, 2011 by Peter Hutterer Committed by Ulrich Sibiller Oct 19, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

Xlibint.h nx-X11/lib/X11/Xlibint.h +4 -4

No files found.
--- a/nx-X11/lib/X11/Xlibint.h
+++ b/nx-X11/lib/X11/Xlibint.h
@@ -461,10 +461,10 @@ extern void *_XGetRequest(Display *dpy, CARD8 type, size_t len);

 #if !defined(UNIXCPP) || defined(ANSICPP)
 #define GetReq(name, req) \
-       req = (x##name##Req *) _XGetRequest(dpy, X_##name, SIZEOF(x##name##Req))
+	GetReqSized(name, SIZEOF(x##name##Req), req)
 #else  /* non-ANSI C uses empty comment instead of "##" for token concatenation */
 #define GetReq(name, req) \
-	req = (x/**/name/**/Req *) _XGetRequest(dpy, X_/**/name, SIZEOF(x/**/name/**/Req))
+	GetReqSized(name, SIZEOF(x/**/name/**/Req), req)
 #endif

 /* GetReqExtra is the same as GetReq, but allocates "n" additional
@@ -472,10 +472,10 @@ extern void *_XGetRequest(Display *dpy, CARD8 type, size_t len);

 #if !defined(UNIXCPP) || defined(ANSICPP)
 #define GetReqExtra(name, n, req) \
-	req = (x##name##Req *) _XGetRequest(dpy, X_##name, SIZEOF(x##name##Req) + n)
+	GetReqSized(name, SIZEOF(x##name##Req) + n, req)
 #else
 #define GetReqExtra(name, n, req) \
-	req = (x/**/name/**/Req *) _XGetRequest(dpy, X_/**/name, SIZEOF(x/**/name/**/Req) + n)
+	GetReqSized(name, SIZEOF(x/**/name/**/Req) + n, req)
 #endif