Added several type casts for C++ compilation. ZOOM fixes.

[yaz-moved-to-github.git] / odr / odr.c

diff --git a/odr/odr.c b/odr/odr.c
index 084b632..a0f34e1 100644 (file)
--- a/odr/odr.c
+++ b/odr/odr.c
@@ -2,7 +2,7 @@
  * Copyright (c) 1995-2002, Index Data
  * See the file LICENSE for details.
  *
- * $Id: odr.c,v 1.36 2002-08-28 07:53:51 adam Exp $
+ * $Id: odr.c,v 1.38 2002-09-24 08:05:41 adam Exp $
  *
  */
 #if HAVE_CONFIG_H
@@ -63,7 +63,7 @@ int odr_set_charset(ODR o, const char *to, const char *from)
     if (o->op->iconv_handle)
         yaz_iconv_close (o->op->iconv_handle);
 
-    o->op->iconv_handle = iconv_open (to, from);
+    o->op->iconv_handle = yaz_iconv_open (to, from);
     if (o->op->iconv_handle == 0)
         return -1;
     return 0;
@@ -84,7 +84,7 @@ ODR odr_createmem(int direction)
     r->can_grow = 1;
     r->mem = nmem_create();
     r->enable_bias = 1;
-    r->op = xmalloc (sizeof(*r->op));
+    r->op = (struct Odr_private *) xmalloc (sizeof(*r->op));
     r->op->odr_ber_tag.lclass = -1;
     r->op->iconv_handle = 0;
     odr_reset(r);