summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@oracle.com>2013-06-24 22:20:41 -0700
committerAlan Coopersmith <alan.coopersmith@oracle.com>2013-06-24 22:20:41 -0700
commit4219ed8b5cfb832b20cb50a0404b3bd02bc863b4 (patch)
tree432a89ab6566a9c73c15db823da8688a481dfa39
parentaac92ef0f20f8ce6592245e9e6ff9d8f7eac3efa (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/XF86VMode.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/src/XF86VMode.c b/src/XF86VMode.c
index fb94816..c85cbd8 100644
--- a/src/XF86VMode.c
+++ b/src/XF86VMode.c
@@ -422,7 +422,6 @@ XF86VidModeGetAllModeLines(Display* dpy, int screen, int* modecount,
/*
* GetReq replacement for use with VidMode protocols earlier than 2.0
*/
-#if !defined(UNIXCPP) || defined(ANSICPP)
#define GetOldReq(name, oldname, req) \
WORD64ALIGN\
if ((dpy->bufptr + SIZEOF(x##oldname##Req)) > dpy->bufmax)\
@@ -433,18 +432,6 @@ XF86VidModeGetAllModeLines(Display* dpy, int screen, int* modecount,
dpy->bufptr += SIZEOF(x##oldname##Req);\
dpy->request++
-#else /* non-ANSI C uses empty comment instead of "##" for token concatenation */
-#define GetOldReq(name, oldname, req) \
- WORD64ALIGN\
- if ((dpy->bufptr + SIZEOF(x/**/oldname/**/Req)) > dpy->bufmax)\
- _XFlush(dpy);\
- req = (x/**/oldname/**/Req *)(dpy->last_req = dpy->bufptr);\
- req->reqType = X_/**/name;\
- req->length = (SIZEOF(x/**/oldname/**/Req))>>2;\
- dpy->bufptr += SIZEOF(x/**/oldname/**/Req);\
- dpy->request++
-#endif
-
Bool
XF86VidModeAddModeLine(Display *dpy, int screen,
XF86VidModeModeInfo* newmodeline,