about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog10
-rw-r--r--conform/data/iconv.h-data2
-rw-r--r--iconv/iconv.c2
-rw-r--r--iconv/iconv.h2
4 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 3d6fb4f13f..56661974bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2000-05-21  Ulrich Drepper  <drepper@redhat.com>
+
+	* iconv/iconv.h (iconv): Remove const from inbuf parameter.
+	* iconv/iconv.c: Likewise.
+	* conform/data/iconv.h-data: Likewise.
+
+	* intl/dcigettext.c: Fix typo in comment.
+
 2000-05-20 2000  H.J. Lu  <hjl@gnu.org>
 
 	* resolv/res_libc.c (_res): Initialize _sock to -1.
@@ -82,7 +90,7 @@
 	Reported by lrgallardo@yahoo.com, closes PR libc/1421.
 
 2000-05-16  Andreas Jaeger  <aj@suse.de>,
-            David Huggins-Daines <dhd@linuxcare.com>
+	    David Huggins-Daines <dhd@linuxcare.com>
 
 	* sysdeps/generic/dl-cache.c (_dl_load_cache_lookup): Set
 	cache_data in case of only new cache format correctly.
diff --git a/conform/data/iconv.h-data b/conform/data/iconv.h-data
index 1c748a04ca..f1e2ea0527 100644
--- a/conform/data/iconv.h-data
+++ b/conform/data/iconv.h-data
@@ -2,7 +2,7 @@
 type iconv_t
 
 function iconv_t iconv_open (const char*, const char*)
-function size_t iconv (iconv_t, const char**, size_t*, char**, size_t*)
+function size_t iconv (iconv_t, char**, size_t*, char**, size_t*)
 function int iconv_close (iconv_t)
 
 allow *_t
diff --git a/iconv/iconv.c b/iconv/iconv.c
index 3fafc88cee..58d977e949 100644
--- a/iconv/iconv.c
+++ b/iconv/iconv.c
@@ -29,7 +29,7 @@
 
 
 size_t
-iconv (iconv_t cd, const char **inbuf, size_t *inbytesleft, char **outbuf,
+iconv (iconv_t cd, char **inbuf, size_t *inbytesleft, char **outbuf,
        size_t *outbytesleft)
 {
   __gconv_t gcd = (__gconv_t) cd;
diff --git a/iconv/iconv.h b/iconv/iconv.h
index 2e5fcb92fa..2165a14623 100644
--- a/iconv/iconv.h
+++ b/iconv/iconv.h
@@ -38,7 +38,7 @@ extern iconv_t iconv_open (__const char *__tocode, __const char *__fromcode)
 /* Convert at most *INBYTESLEFT bytes from *INBUF according to the
    code conversion algorithm specified by CD and place up to
    *OUTBYTESLEFT bytes in buffer at *OUTBUF.  */
-extern size_t iconv (iconv_t __cd, __const char **__restrict __inbuf,
+extern size_t iconv (iconv_t __cd, char **__restrict __inbuf,
 		     size_t *__restrict __inbytesleft,
 		     char **__restrict __outbuf,
 		     size_t *__restrict __outbytesleft);