mirror of
https://gitlab.freedesktop.org/xorg/lib/libx11.git
synced 2026-05-26 10:08:25 +02:00
reduce compiler warnings for macros BufAlloc, Data and Data32 using casts
Signed-off-by: Thomas E. Dickey <dickey@invisible-island.net>
This commit is contained in:
parent
62c3337d89
commit
ddaacd2196
1 changed files with 6 additions and 6 deletions
|
|
@ -641,10 +641,10 @@ extern void _XFlushGCCache(Display *dpy, GC gc);
|
|||
#ifndef DataRoutineIsProcedure
|
||||
#define Data(dpy, data, len) {\
|
||||
if (dpy->bufptr + (len) <= dpy->bufmax) {\
|
||||
memcpy(dpy->bufptr, data, (int)(len));\
|
||||
dpy->bufptr += ((len) + 3) & ~3;\
|
||||
memcpy(dpy->bufptr, data, (size_t)(len));\
|
||||
dpy->bufptr += ((size_t)((len) + 3) & (size_t)~3);\
|
||||
} else\
|
||||
_XSend(dpy, data, len);\
|
||||
_XSend(dpy, (_Xconst char*)(data), (long)(len));\
|
||||
}
|
||||
#endif /* DataRoutineIsProcedure */
|
||||
|
||||
|
|
@ -667,14 +667,14 @@ extern void _XFlushGCCache(Display *dpy, GC gc);
|
|||
if (dpy->bufptr + (n) > dpy->bufmax) \
|
||||
_XFlush (dpy); \
|
||||
ptr = (type) dpy->bufptr; \
|
||||
memset(ptr, '\0', n); \
|
||||
memset(ptr, '\0', (size_t)(n)); \
|
||||
dpy->bufptr += (n);
|
||||
|
||||
#define Data16(dpy, data, len) Data((dpy), (_Xconst char *)(data), (len))
|
||||
#define _XRead16Pad(dpy, data, len) _XReadPad((dpy), (char *)(data), (len))
|
||||
#define _XRead16(dpy, data, len) _XRead((dpy), (char *)(data), (len))
|
||||
#ifdef LONG64
|
||||
#define Data32(dpy, data, len) _XData32(dpy, (_Xconst long *)data, len)
|
||||
#define Data32(dpy, data, len) _XData32(dpy, (_Xconst long *)(data), (unsigned)(len))
|
||||
extern int _XData32(
|
||||
Display *dpy,
|
||||
_Xconst long *data,
|
||||
|
|
@ -686,7 +686,7 @@ extern void _XRead32(
|
|||
long len
|
||||
);
|
||||
#else
|
||||
#define Data32(dpy, data, len) Data((dpy), (_Xconst char *)(data), (len))
|
||||
#define Data32(dpy, data, len) Data((dpy), (_Xconst char *)(data), (long)(len))
|
||||
#define _XRead32(dpy, data, len) _XRead((dpy), (char *)(data), (len))
|
||||
#endif
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue