diff options
| -rw-r--r-- | libmpx/ChangeLog | 5 | ||||
| -rw-r--r-- | libmpx/mpxwrap/mpx_wrappers.c | 12 |
2 files changed, 11 insertions, 6 deletions
diff --git a/libmpx/ChangeLog b/libmpx/ChangeLog index d5308077849..d028bcafde5 100644 --- a/libmpx/ChangeLog +++ b/libmpx/ChangeLog @@ -1,3 +1,8 @@ +2016-01-18 Jakub Jelinek <jakub@redhat.com> + + * mpxwrap/mpx_wrappers.c (__mpx_wrapper_memmove): Avoid + -Wdiscarded-qualifiers warning. Fix up formatting. + 2015-12-29 Tsvetkova Alexandra <aleksandra.tsvetkova@intel.com> * libmpxwrap/mpx_wrappers.c (__mpx_wrapper_memmove): Special diff --git a/libmpx/mpxwrap/mpx_wrappers.c b/libmpx/mpxwrap/mpx_wrappers.c index 4df4e9e76e8..d4c83ef484c 100644 --- a/libmpx/mpxwrap/mpx_wrappers.c +++ b/libmpx/mpxwrap/mpx_wrappers.c @@ -486,12 +486,12 @@ __mpx_wrapper_memmove (void *dst, const void *src, size_t n) /* When we copy exactly one pointer it is faster to just use bndldx + bndstx. */ if (n == sizeof (void *)) - { - const void **s = (const void**)src; - void **d = (void**)dst; - *d = *s; - return dst; - } + { + void *const *s = (void *const *) src; + void **d = (void **) dst; + *d = *s; + return dst; + } memmove (dst, src, n); |