diff options
| author | marha <marha@users.sourceforge.net> | 2013-07-08 13:26:58 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-07-08 13:26:58 +0200 |
| commit | ecf91092594b6cd72548f6a675515e84516398ff (patch) | |
| tree | 16e61fa5c11e4870d20cc82036990ea1e761f82b /libX11/src | |
| parent | 6e0dd97c65930e5138a1511309efa3325292634a (diff) | |
| parent | a9866a9e7dc9c89962a13d6e750aa5a18b98369c (diff) | |
| download | vcxsrv-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')
| -rw-r--r-- | libX11/src/PutImage.c | 6 | ||||
| -rw-r--r-- | libX11/src/globals.c | 6 |
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 */ /* |