about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1998-09-05 04:01:08 +0000
committerRoland McGrath <roland@gnu.org>1998-09-05 04:01:08 +0000
commit62ee0979f4f39c98e6d8eb91bba2b480db035bfd (patch)
treed2e1f3969a9489502d93305b2bc4c0894674441b
parent59cacc8162df151f12590ea4918cccb624abc275 (diff)
downloadglibc-62ee0979f4f39c98e6d8eb91bba2b480db035bfd.tar.gz
glibc-62ee0979f4f39c98e6d8eb91bba2b480db035bfd.tar.xz
glibc-62ee0979f4f39c98e6d8eb91bba2b480db035bfd.zip
* string/argz.h (argz_next): Add de-consting cast for return.
-rw-r--r--ChangeLog2
-rw-r--r--string/argz.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3d08e58ad8..5056d33fb2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 1998-09-05  Roland McGrath  <roland@baalperazim.frob.com>
 
+	* string/argz.h (argz_next): Add de-consting cast for return.
+
 	* sysdeps/unix/sysv/linux/Makefile [$(subdir)=inet] (sysdep_headers):
 	Don't add netinet/udp.h, netinet/ip_icmp.h here.
 	* sysdeps/gnu/Makefile: Do it here instead.
diff --git a/string/argz.h b/string/argz.h
index 49445bc3f7..cdd9c50400 100644
--- a/string/argz.h
+++ b/string/argz.h
@@ -147,7 +147,7 @@ __argz_next (__const char *__argz, size_t __argz_len, __const char *__entry)
       return __entry >= __argz + __argz_len ? (char *) NULL : (char *) __entry;
     }
   else
-    return __argz_len > 0 ? __argz : 0;
+    return __argz_len > 0 ? (char *) __argz : 0;
 }
 extern inline char *
 argz_next (__const char *__argz, size_t __argz_len, __const char *__entry)