From 7378d4bdbd33ed49ed6cfa5c4f73d7527982aab4 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Mon, 24 Jun 2013 22:55:18 -0700 Subject: Require ANSI C89 pre-processor, drop pre-C89 token pasting support Signed-off-by: Alan Coopersmith --- include/X11/extensions/multibuf.h | 6 ------ src/Xdbe.c | 6 ------ src/globals.c | 6 ------ 3 files changed, 18 deletions(-) diff --git a/include/X11/extensions/multibuf.h b/include/X11/extensions/multibuf.h index 12fda35..27165f0 100644 --- a/include/X11/extensions/multibuf.h +++ b/include/X11/extensions/multibuf.h @@ -30,15 +30,9 @@ in this Software without prior written authorization from The Open Group. #include -#if !defined(UNIXCPP) || defined(ANSICPP) #define MbufGetReq(name,req,info) GetReq (name, req); \ req->reqType = info->codes->major_opcode; \ req->mbufReqType = X_##name; -#else -#define MbufGetReq(name,req,info) GetReq (name, req); \ - req->reqType = info->codes->major_opcode; \ - req->mbufReqType = X_/**/name; -#endif /* * Extra definitions that will only be needed in the client diff --git a/src/Xdbe.c b/src/Xdbe.c index 016886c..7dd6c5a 100644 --- a/src/Xdbe.c +++ b/src/Xdbe.c @@ -51,15 +51,9 @@ static const char *dbe_extension_name = DBE_PROTOCOL_NAME; #define DbeSimpleCheckExtension(dpy,i) \ XextSimpleCheckExtension (dpy, i, dbe_extension_name) -#if !defined(UNIXCPP) #define DbeGetReq(name,req,info) GetReq (name, req); \ req->reqType = info->codes->major_opcode; \ req->dbeReqType = X_##name; -#else -#define DbeGetReq(name,req,info) GetReq (name, req); \ - req->reqType = info->codes->major_opcode; \ - req->dbeReqType = X_/**/name; -#endif /***************************************************************************** diff --git a/src/globals.c b/src/globals.c index 8b5923d..d5e7ad0 100644 --- a/src/globals.c +++ b/src/globals.c @@ -51,15 +51,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 ATTSHAREDLIB */ /* -- cgit v1.2.1