Mercurial > octave

changeset 29406:69087119ee84 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix compilation error with iconv_t on Solaris (bug #60162). * liboctave/wrappers/iconv-wrappers.c: Use same function prototypes in definition as in declaration. Explicitly cast between (void *) and (iconv_t).
author Markus Mützel <markus.muetzel@gmx.de>
date Wed, 03 Mar 2021 18:43:04 +0100
parents ce425b657693
children a08b08b6264d f4cf798e6d8f
files liboctave/wrappers/iconv-wrappers.c
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/wrappers/iconv-wrappers.c	Mon Mar 01 09:45:56 2021 -0800
+++ b/liboctave/wrappers/iconv-wrappers.c	Wed Mar 03 18:43:04 2021 +0100
@@ -31,14 +31,14 @@
 
 #include "iconv-wrappers.h"
 
-iconv_t
+void *
 octave_iconv_open_wrapper (const char *tocode, const char *fromcode)
 {
-  return iconv_open (tocode, fromcode);
+  return (void *) iconv_open (tocode, fromcode);
 }
 
 int
-octave_iconv_close_wrapper (iconv_t cd)
+octave_iconv_close_wrapper (void *cd)
 {
-  return iconv_close (cd);
+  return iconv_close ((iconv_t) cd);
 }