about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--string/bits/string2.h3
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 1f6c1b9ad4..42a3b69ca5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1999-10-14  Cristian Gafton  <gafton@redhat.com>
+
+	* string/bits/string2.h (__stpcpy_small): Make -pedantic shut up.
+
 1999-10-14  Andreas Jaeger  <aj@suse.de>
 
 	* resolv/inet_addr.c (inet_aton): Fix last patch.  The little
diff --git a/string/bits/string2.h b/string/bits/string2.h
index e01560988e..5c4777d99b 100644
--- a/string/bits/string2.h
+++ b/string/bits/string2.h
@@ -563,6 +563,7 @@ __stpcpy_small (char *__dest,
     unsigned int __ui;
     unsigned short int __usi;
     unsigned char __uc;
+    char __c;
   } *__u = (void *) __dest;
   switch (__srclen)
     {
@@ -607,7 +608,7 @@ __stpcpy_small (char *__dest,
       __u = __extension__ ((void *) __u + 3);
       break;
     }
-  return &__u->__uc;
+  return &__u->__c;
 }
 #  else
 #  define __stpcpy_args(src) \