From: Ulrich Drepper <drepper@redhat.com>
Date: Mon, 26 Jul 1999 16:06:32 +0000 (+0000)
Subject: Update.
X-Git-Tag: upstream/2.30~26972
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b18ac18e67746792dd969e7ca0b8a92bae341cae;p=external%2Fglibc.git

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 0a046e1..d216889 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 f27ea62..d81f02f 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;