diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2013-06-24 23:02:05 -0700 |
|---|---|---|
| committer | Ulrich Sibiller <uli42@gmx.de> | 2016-10-19 21:40:27 +0200 |
| commit | 88edf80838c182ec5a533e2ffec429747b128355 (patch) | |
| tree | 2513939e17ae6e34f0ef9cba34cbe3015f02dfde /nx-X11/lib/X11/Xlibint.h | |
| parent | 7f98ab03b47ca980bf656ca6083d74c5b4546da9 (diff) | |
| download | nx-libs-88edf80838c182ec5a533e2ffec429747b128355.tar.gz nx-libs-88edf80838c182ec5a533e2ffec429747b128355.tar.bz2 nx-libs-88edf80838c182ec5a533e2ffec429747b128355.zip | |
Require ANSI C89 pre-processor, drop pre-C89 token pasting support
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Backported-to-NX-by: Ulrich Sibiller <uli42@gmx.de>
Diffstat (limited to 'nx-X11/lib/X11/Xlibint.h')
| -rw-r--r-- | nx-X11/lib/X11/Xlibint.h | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/nx-X11/lib/X11/Xlibint.h b/nx-X11/lib/X11/Xlibint.h index 31bec58f9..d4767ecfc 100644 --- a/nx-X11/lib/X11/Xlibint.h +++ b/nx-X11/lib/X11/Xlibint.h @@ -460,14 +460,8 @@ extern void *_XGetRequest(Display *dpy, CARD8 type, size_t len); /* GetReqSized is the same as GetReq but allows the caller to specify the * size in bytes. 'sz' must be a multiple of 4! */ -#if !defined(UNIXCPP) || defined(ANSICPP) #define GetReqSized(name, sz, req) \ req = (x##name##Req *) _XGetRequest(dpy, X_##name, sz) -#else -#define GetReqSized(name, sz, req) \ - req = (x/**/name/**/Req *) _XGetRequest(dpy, X_/**/name, sz) -#endif - /* * GetReq - Get the next available X request packet in the buffer and @@ -478,25 +472,14 @@ extern void *_XGetRequest(Display *dpy, CARD8 type, size_t len); * */ -#if !defined(UNIXCPP) || defined(ANSICPP) #define GetReq(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) \ - GetReqSized(name, SIZEOF(x/**/name/**/Req), req) -#endif /* GetReqExtra is the same as GetReq, but allocates "n" additional bytes after the request. "n" must be a multiple of 4! */ -#if !defined(UNIXCPP) || defined(ANSICPP) #define GetReqExtra(name, n, req) \ GetReqSized(name, SIZEOF(x##name##Req) + n, req) -#else -#define GetReqExtra(name, n, req) \ - GetReqSized(name, SIZEOF(x/**/name/**/Req) + n, req) -#endif - /* * GetResReq is for those requests that have a resource ID @@ -504,27 +487,16 @@ extern void *_XGetRequest(Display *dpy, CARD8 type, size_t len); * "rid" is the name of the resource. */ -#if !defined(UNIXCPP) || defined(ANSICPP) #define GetResReq(name, rid, req) \ req = (xResourceReq *) _XGetRequest(dpy, X_##name, SIZEOF(xResourceReq)); \ req->id = (rid) -#else -#define GetResReq(name, rid, req) \ - req = (xResourceReq *) _XGetRequest(dpy, X_/**/name, SIZEOF(xResourceReq)); \ - req->id = (rid) -#endif /* * GetEmptyReq is for those requests that have no arguments * at all. */ -#if !defined(UNIXCPP) || defined(ANSICPP) #define GetEmptyReq(name, req) \ req = (xReq *) _XGetRequest(dpy, X_##name, SIZEOF(xReq)) -#else -#define GetEmptyReq(name, req) \ - req = (xReq *) _XGetRequest(dpy, X_/**/name, SIZEOF(xReq)) -#endif /* * MakeBigReq sets the CARD16 "req->length" to 0 and inserts a new CARD32 |