aboutsummaryrefslogtreecommitdiff
path: root/libX11/src/globals.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-07-08 13:26:58 +0200
committermarha <marha@users.sourceforge.net>2013-07-08 13:26:58 +0200
commitecf91092594b6cd72548f6a675515e84516398ff (patch)
tree16e61fa5c11e4870d20cc82036990ea1e761f82b /libX11/src/globals.c
parent6e0dd97c65930e5138a1511309efa3325292634a (diff)
parenta9866a9e7dc9c89962a13d6e750aa5a18b98369c (diff)
downloadvcxsrv-ecf91092594b6cd72548f6a675515e84516398ff.tar.gz
vcxsrv-ecf91092594b6cd72548f6a675515e84516398ff.tar.bz2
vcxsrv-ecf91092594b6cd72548f6a675515e84516398ff.zip
Merge remote-tracking branch 'origin/released'
* origin/released: libX11 git update 8 Jul 2013
Diffstat (limited to 'libX11/src/globals.c')
-rw-r--r--libX11/src/globals.c6
1 files changed, 0 insertions, 6 deletions
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 */
/*