diff options
Diffstat (limited to 'libX11')
| -rw-r--r-- | libX11/include/X11/Xlibint.h | 29 | ||||
| -rw-r--r-- | libX11/src/PutImage.c | 6 | ||||
| -rw-r--r-- | libX11/src/globals.c | 6 |
3 files changed, 1 insertions, 40 deletions
diff --git a/libX11/include/X11/Xlibint.h b/libX11/include/X11/Xlibint.h index acbad6beb..443155964 100644 --- a/libX11/include/X11/Xlibint.h +++ b/libX11/include/X11/Xlibint.h @@ -420,14 +420,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 @@ -438,25 +432,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 @@ -464,27 +447,17 @@ 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 diff --git a/libX11/src/PutImage.c b/libX11/src/PutImage.c index 2a694f099..934fabe0f 100644 --- a/libX11/src/PutImage.c +++ b/libX11/src/PutImage.c @@ -600,15 +600,9 @@ static int const HalfOrderWord[12] = { /* Cancel a GetReq operation, before doing _XSend or Data */ -#if (defined(__STDC__) && !defined(UNIXCPP)) || defined(ANSICPP) #define UnGetReq(name)\ dpy->bufptr -= SIZEOF(x##name##Req);\ dpy->request-- -#else -#define UnGetReq(name)\ - dpy->bufptr -= SIZEOF(x/**/name/**/Req);\ - dpy->request-- -#endif static void SendXYImage( diff --git a/libX11/src/globals.c b/libX11/src/globals.c index b7e49dda5..47042088c 100644 --- a/libX11/src/globals.c +++ b/libX11/src/globals.c @@ -53,15 +53,9 @@ from The Open Group. /* * If we need to define extra variables for each global */ -#if !defined(UNIXCPP) || defined(ANSICPP) #define ZEROINIT(t,var,val) SetZero(t,var,val); \ SetZero (long, _libX_##var##Flag, 0); \ SetZero (void *, _libX_##var##Ptr, NULL) -#else /* else pcc concatenation */ -#define ZEROINIT(t,var,val) SetZero(t,var,val); \ - SetZero (long, _libX_/**/var/**/Flag, 0); \ - SetZero (void *, _libX_/**/var/**/Ptr, NULL) -#endif /* concat ANSI C vs. pcc */ #else /* else not USL_SHAREDLIB */ /* |