Mercurial > octave

changeset 29407:a08b08b6264d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: merge stable to default.
author Markus Mützel <markus.muetzel@gmx.de>
date Thu, 04 Mar 2021 08:44:58 +0100
parents 2f09b4c03436 (current diff) 69087119ee84 (diff)
children d6908a010a89
files
diffstat 1 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/wrappers/iconv-wrappers.c	Wed Mar 03 23:45:46 2021 +0100
+++ b/liboctave/wrappers/iconv-wrappers.c	Thu Mar 04 08:44:58 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);
 }