aboutsummaryrefslogtreecommitdiff
path: root/libXext/src
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-06-26 15:01:24 +0200
committermarha <marha@users.sourceforge.net>2013-06-26 15:01:24 +0200
commit2fe2056807d1304de86deb2b59992d51d9252ad0 (patch)
tree665d730ee19df03e4dfca01371009ec778a343af /libXext/src
parentfa791414601df61d20d860299dba80fdb62565df (diff)
downloadvcxsrv-2fe2056807d1304de86deb2b59992d51d9252ad0.tar.gz
vcxsrv-2fe2056807d1304de86deb2b59992d51d9252ad0.tar.bz2
vcxsrv-2fe2056807d1304de86deb2b59992d51d9252ad0.zip
libXext mesa git update 29 June 20013
libXext commit 7378d4bdbd33ed49ed6cfa5c4f73d7527982aab4 mesa commit 9aebad618c0aab527a0b838ce0a79ffa6dd426bb
Diffstat (limited to 'libXext/src')
-rw-r--r--libXext/src/XSync.c2
-rw-r--r--libXext/src/Xdbe.c6
-rw-r--r--libXext/src/globals.c6
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 */
/*