diff options
| -rw-r--r-- | include/X11/IntrinsicI.h | 8 | ||||
| -rw-r--r-- | src/Convert.c | 4 | ||||
| -rw-r--r-- | src/Resources.c | 4 | ||||
| -rw-r--r-- | src/TMkey.c | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/include/X11/IntrinsicI.h b/include/X11/IntrinsicI.h index d477c1d..c6d5773 100644 --- a/include/X11/IntrinsicI.h +++ b/include/X11/IntrinsicI.h @@ -117,15 +117,15 @@ SOFTWARE. #include <X11/Xfuncs.h> #define XtMemmove(dst, src, size) \ - if ((char *)(dst) != (char *)(src)) { \ - (void) memcpy((char *) (dst), (char *) (src), (size_t) (size)); \ + if ((const void *)(dst) != (const void *)(src)) { \ + (void) memcpy((void *) (dst), (const void *) (src), (size_t) (size)); \ } #define XtBZero(dst, size) \ - memset((char *) (dst), 0, (size_t) (size)) + memset((void *) (dst), 0, (size_t) (size)) #define XtMemcmp(b1, b2, size) \ - memcmp((char *) (b1), (char *) (b2), (size_t) (size)) + memcmp((const void *) (b1), (const void *) (b2), (size_t) (size)) /**************************************************************** diff --git a/src/Convert.c b/src/Convert.c index 5943c3b..3adfb92 100644 --- a/src/Convert.c +++ b/src/Convert.c @@ -649,7 +649,7 @@ void XtDirectConvert( && (p->from.size == from->size) && !(p->from_is_value ? XtMemcmp(&p->from.addr, from->addr, from->size) : - memcmp((char *)p->from.addr, (char *)from->addr, from->size)) + memcmp((const void *)p->from.addr, (const void *)from->addr, from->size)) && (p->num_args == num_args)) { if ((i = num_args)) { XrmValue *pargs = CARGS(p); @@ -747,7 +747,7 @@ CallConverter( && (p->from.size == from->size) && !(p->from_is_value ? XtMemcmp(&p->from.addr, from->addr, from->size) : - memcmp((char *)p->from.addr, (char *)from->addr, from->size)) + memcmp((const void *)p->from.addr, (const void *)from->addr, from->size)) && (p->num_args == num_args)) { if ((i = num_args)) { XrmValue *pargs = CARGS(p); diff --git a/src/Resources.c b/src/Resources.c index 50d30fb..672f5b9 100644 --- a/src/Resources.c +++ b/src/Resources.c @@ -519,8 +519,8 @@ static XtCacheRef *GetResources( } /* Mark each resource as not found on arg list */ - memset((char *) found, 0, (size_t) (num_resources * sizeof(Boolean))); - memset((char *) typed, 0, (size_t) (num_resources * sizeof(int))); + memset((void *) found, 0, (size_t) (num_resources * sizeof(Boolean))); + memset((void *) typed, 0, (size_t) (num_resources * sizeof(int))); /* Copy the args into the resources, mark each as found */ { diff --git a/src/TMkey.c b/src/TMkey.c index 6071658..7970f5a 100644 --- a/src/TMkey.c +++ b/src/TMkey.c @@ -86,7 +86,7 @@ in this Software without prior written authorization from The Open Group. #endif #define FLUSHKEYCACHE(ctx) \ - memset((char *)&ctx->keycache, 0, sizeof(TMKeyCache)) + memset((void *)&ctx->keycache, 0, sizeof(TMKeyCache)) /* * The following array reorders the modifier bits so that the most common ones |