[Groff-commit] groff ./ChangeLog src/preproc/preconv/preconv.cpp

[Werner LEMBERG]

CVSROOT:        /cvsroot/groff
Module name:    groff
Branch:         
Changes by:     Werner LEMBERG <address@hidden> 06/01/10 06:36:00

Modified files:
        .              : ChangeLog 
        src/preproc/preconv: preconv.cpp 

Log message:
        * src/preproc/preconv/preconv.cpp (conversion_iconv): Use
        ICONV_CONST in call to iconv.  Reported by Robert Goulding.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/groff/groff/ChangeLog.diff?tr1=1.880&tr2=1.881&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/groff/groff/src/preproc/preconv/preconv.cpp.diff?tr1=1.7&tr2=1.8&r1=text&r2=text

Patches:
Index: groff/ChangeLog
diff -u groff/ChangeLog:1.880 groff/ChangeLog:1.881
--- groff/ChangeLog:1.880       Sun Jan  8 09:20:06 2006
+++ groff/ChangeLog     Tue Jan 10 06:36:00 2006
@@ -1,3 +1,8 @@
+2006-01-10  Werner LEMBERG  <address@hidden>
+
+       * src/preproc/preconv/preconv.cpp (conversion_iconv): Use
+       ICONV_CONST in call to iconv.  Reported by Robert Goulding.
+
 2006-01-07  Werner LEMBERG  <address@hidden>
 
        * fonts/devps/generate/freeeuro.sfd: Run auto-hinter with recent
Index: groff/src/preproc/preconv/preconv.cpp
diff -u groff/src/preproc/preconv/preconv.cpp:1.7 
groff/src/preproc/preconv/preconv.cpp:1.8
--- groff/src/preproc/preconv/preconv.cpp:1.7   Thu Jan  5 15:45:00 2006
+++ groff/src/preproc/preconv/preconv.cpp       Tue Jan 10 06:36:00 2006
@@ -665,7 +665,8 @@
   size_t inbytes_left = data.length();
   char *limit;
   while (inbytes_left > 0) {
-    size_t status = iconv(handle, &inptr, &inbytes_left,
+    size_t status = iconv(handle,
+                         (ICONV_CONST char **)&inptr, &inbytes_left,
                          &outptr, &outbytes_left);
     if (status == (size_t)-1) {
       if (errno == EILSEQ) {
@@ -696,7 +697,8 @@
     inptr = inbuf;
     inbytes_left += read_bytes;
     while (inbytes_left > 0) {
-      size_t status = iconv(handle, &inptr, &inbytes_left,
+      size_t status = iconv(handle,
+                           (ICONV_CONST char **)&inptr, &inbytes_left,
                            &outptr, &outbytes_left);
       if (status == (size_t)-1) {
        if (errno == EILSEQ) {