diff options
| author | marha <marha@users.sourceforge.net> | 2013-06-28 16:49:07 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-06-28 16:49:07 +0200 |
| commit | 3c204c4a20943586532ce477ced827d108f3b4b0 (patch) | |
| tree | c9891fdc315c41cc90806634589231172572b2ba /libXext/src | |
| parent | 73a26452133415b7e3bf54836d23995d59a7bac4 (diff) | |
| parent | ced1a6b8f5a750fcd3b8d3d0d9bbdee830064e6c (diff) | |
| download | vcxsrv-3c204c4a20943586532ce477ced827d108f3b4b0.tar.gz vcxsrv-3c204c4a20943586532ce477ced827d108f3b4b0.tar.bz2 vcxsrv-3c204c4a20943586532ce477ced827d108f3b4b0.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa git update 28 June 2013
libXext mesa git update 29 June 20013
Diffstat (limited to 'libXext/src')
| -rw-r--r-- | libXext/src/XSync.c | 2 | ||||
| -rw-r--r-- | libXext/src/Xdbe.c | 6 | ||||
| -rw-r--r-- | libXext/src/globals.c | 6 |
3 files changed, 1 insertions, 13 deletions
diff --git a/libXext/src/XSync.c b/libXext/src/XSync.c index ce4ab44d9..6e2af79a5 100644 --- a/libXext/src/XSync.c +++ b/libXext/src/XSync.c @@ -189,7 +189,7 @@ char *error_string(Display *dpy, int code, XExtCodes *codes, char *buf, int n) code -= codes->first_error; if (code >= 0 && code < nerr) { char tmp[256]; - sprintf (tmp, "%s.%d", sync_extension_name, code); + snprintf (tmp, sizeof(tmp), "%s.%d", sync_extension_name, code); XGetErrorDatabaseText (dpy, "XProtoError", tmp, sync_error_list[code], buf, n); return buf; } diff --git a/libXext/src/Xdbe.c b/libXext/src/Xdbe.c index 016886c58..7dd6c5ad2 100644 --- a/libXext/src/Xdbe.c +++ b/libXext/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/libXext/src/globals.c b/libXext/src/globals.c index 8b5923de6..d5e7ad0c4 100644 --- a/libXext/src/globals.c +++ b/libXext/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 */ /* |