Update.

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.

diff --git a/ChangeLog b/ChangeLog
index 0a046e120b3a3f863d91381192789b5700dba16e..d216889ed235e375f216a5a4576837d476551b2d 100644 (file)
--- 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 f27ea6269d9148af9a242872b4ad6c795031a011..d81f02fb5d539ea4b620fb50e6f80ce18a9b9060 100644 (file)
--- 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;