summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2013-07-05 21:53:59 -0700
committerAlan Coopersmith <alan.coopersmith@oracle.com>2013-07-05 21:58:41 -0700
commit689444a78bf78d3c7eee75502bdc8bcecfd2e544 (patch)
treed2738a785a8a2fe3a02d0415eb941cfb5532cf8d
parent699d2487d53da3373377d9c099fb64324dda1f5e (diff)
Require ANSI C89 pre-processor, drop pre-C89 token pasting support
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-rw-r--r--src/XERqsts.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/src/XERqsts.c b/src/XERqsts.c
index 6fd6be0..a64a6c7 100644
--- a/src/XERqsts.c
+++ b/src/XERqsts.c
@@ -35,7 +35,6 @@ SOFTWARE.
#include <X11/Xproto.h>
#endif /* NO_DEC_BUG_FIX */
/* the following's a hack to support V3.1 protocol */
-#if defined(__STDC__) && !defined(UNIXCPP)
#define GetOldReq(name, req, old_length) \
WORD64ALIGN\
if ((dpy->bufptr + SIZEOF(x##name##Req)) > dpy->bufmax)\
@@ -46,18 +45,6 @@ SOFTWARE.
dpy->bufptr += old_length;\
dpy->request++
-#else /* non-ANSI C uses empty comment instead of "##" for token concat */
-#define GetOldReq(name, req, old_length) \
- WORD64ALIGN\
- if ((dpy->bufptr + SIZEOF(x/**/name/**/Req)) > dpy->bufmax)\
- _XFlush(dpy);\
- req = (x/**/name/**/Req *)(dpy->last_req = dpy->bufptr);\
- req->reqType = X_/**/name;\
- req->length = old_length>>2;\
- dpy->bufptr += old_length;\
- dpy->request++
-#endif
-
#include <X11/Xlibint.h>
#include <X11/extensions/xtraplib.h>