aboutsummaryrefslogtreecommitdiff
path: root/libXext/include
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/include
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/include')
-rw-r--r--libXext/include/X11/extensions/extutil.h2
-rw-r--r--libXext/include/X11/extensions/multibuf.h6
2 files changed, 1 insertions, 7 deletions
diff --git a/libXext/include/X11/extensions/extutil.h b/libXext/include/X11/extensions/extutil.h
index 29404d5ae..b22843068 100644
--- a/libXext/include/X11/extensions/extutil.h
+++ b/libXext/include/X11/extensions/extutil.h
@@ -178,7 +178,7 @@ char *proc (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", extname, code); \
+ snprintf (tmp, sizeof(tmp), "%s.%d", extname, code); \
XGetErrorDatabaseText (dpy, "XProtoError", tmp, errl[code], buf, n); \
return buf; \
} \
diff --git a/libXext/include/X11/extensions/multibuf.h b/libXext/include/X11/extensions/multibuf.h
index 12fda357d..27165f08a 100644
--- a/libXext/include/X11/extensions/multibuf.h
+++ b/libXext/include/X11/extensions/multibuf.h
@@ -30,15 +30,9 @@ in this Software without prior written authorization from The Open Group.
#include <X11/extensions/multibufconst.h>
-#if !defined(UNIXCPP) || defined(ANSICPP)
#define MbufGetReq(name,req,info) GetReq (name, req); \
req->reqType = info->codes->major_opcode; \
req->mbufReqType = X_##name;
-#else
-#define MbufGetReq(name,req,info) GetReq (name, req); \
- req->reqType = info->codes->major_opcode; \
- req->mbufReqType = X_/**/name;
-#endif
/*
* Extra definitions that will only be needed in the client