summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2011-10-27 13:53:22 +1000
committerPeter Hutterer <peter.hutterer@who-t.net>2011-11-08 07:24:07 +1000
commitf6dad6aaa384bf836baa28ccb72b476a85c40eff (patch)
tree12a3feaa326d096b9a5c0d8b6475157c34a9fa3d
parentc9c99058b9d98789c0b2d7e78a23443c2b57a047 (diff)
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>
-rw-r--r--include/X11/Xlibint.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/X11/Xlibint.h b/include/X11/Xlibint.h
index 9d75d06..80edeec 100644
--- a/include/X11/Xlibint.h
+++ b/include/X11/Xlibint.h
@@ -456,10 +456,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
@@ -467,10 +467,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