aboutsummaryrefslogtreecommitdiff
path: root/libX11/src
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-07-08 13:21:29 +0200
committermarha <marha@users.sourceforge.net>2013-07-08 13:21:29 +0200
commita9866a9e7dc9c89962a13d6e750aa5a18b98369c (patch)
tree9b1126d2d0136bef2ebbdef862d0ce255ede4bcf /libX11/src
parent2ecad38adbeaa652daaab8f2a6d112921b7e74eb (diff)
downloadvcxsrv-a9866a9e7dc9c89962a13d6e750aa5a18b98369c.tar.gz
vcxsrv-a9866a9e7dc9c89962a13d6e750aa5a18b98369c.tar.bz2
vcxsrv-a9866a9e7dc9c89962a13d6e750aa5a18b98369c.zip
libX11 git update 8 Jul 2013
libX11 commit a336db9a0add3ae0783dda6e52459236622a12af
Diffstat (limited to 'libX11/src')
-rw-r--r--libX11/src/PutImage.c6
-rw-r--r--libX11/src/globals.c6
2 files changed, 0 insertions, 12 deletions
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 */
/*