diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | string/bits/string2.h | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 0a046e120b..d216889ed2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +1999-07-26 Jakub Jelinek <jj@ultra.linux.jz> + + * string/bits/string2.h (__strcpy_small): Avoid compile time warning. + (__stpcpy_small): Likewise. + Union has no __uc member but __c. + 1999-07-26 Andreas Schwab <schwab@suse.de> * sysdeps/m68k/dl-machine.h (RTLD_START): Call pre-init funtions. diff --git a/string/bits/string2.h b/string/bits/string2.h index f27ea6269d..d81f02fb5d 100644 --- a/string/bits/string2.h +++ b/string/bits/string2.h @@ -497,7 +497,7 @@ __strcpy_small (char *__dest, __STRING2_COPY_ARR6 __sca6; __STRING2_COPY_ARR7 __sca7; __STRING2_COPY_ARR8 __sca8; - } *__u = __dest; + } *__u = (void *) __dest; switch (__srclen) { case 1: @@ -660,11 +660,11 @@ __stpcpy_small (char *__dest, __STRING2_COPY_ARR6 __sca6; __STRING2_COPY_ARR7 __sca7; __STRING2_COPY_ARR8 __sca8; - } *__u = __dest; + } *__u = (void *) __dest; switch (__srclen) { case 1: - __u->__uc = '\0'; + __u->__c = '\0'; break; case 2: __extension__ __u->__sca2 = __src2; |