From a9866a9e7dc9c89962a13d6e750aa5a18b98369c Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Mon, 8 Jul 2013 13:21:29 +0200
Subject: libX11 git update 8 Jul 2013

libX11           commit a336db9a0add3ae0783dda6e52459236622a12af
---
 libX11/src/PutImage.c | 6 ------
 libX11/src/globals.c  | 6 ------
 2 files changed, 12 deletions(-)

(limited to 'libX11/src')

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 */
 /*
-- 
cgit v1.2.3