diff options
Diffstat (limited to 'X11/extensions')
| -rw-r--r-- | X11/extensions/extutil.h | 3 | ||||
| -rw-r--r-- | X11/extensions/multibuf.h | 6 |
2 files changed, 2 insertions, 7 deletions
diff --git a/X11/extensions/extutil.h b/X11/extensions/extutil.h index 29404d5ae..074cc183a 100644 --- a/X11/extensions/extutil.h +++ b/X11/extensions/extutil.h @@ -34,6 +34,7 @@ in this Software without prior written authorization from The Open Group. #ifndef _EXTUTIL_H_ #define _EXTUTIL_H_ +#include <unistd.h> #include <X11/extensions/Xext.h> /* @@ -178,7 +179,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/X11/extensions/multibuf.h b/X11/extensions/multibuf.h index 12fda357d..27165f08a 100644 --- a/X11/extensions/multibuf.h +++ b/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 |