X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=odr%2Fodr-priv.h;h=0c609403ad7256a11aa51bc64780df504ac2931a;hb=a6d84a7dae6b0dc41228c301069bb14fb26bd38e;hp=5a5ca1a85a6ae1ef10120486c8f64fc1c875a391;hpb=a67cc28231d95548fda7d7b9626b0ead7eb0f13f;p=yaz-moved-to-github.git

diff --git a/odr/odr-priv.h b/odr/odr-priv.h
index 5a5ca1a..0c60940 100644
--- a/odr/odr-priv.h
+++ b/odr/odr-priv.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995-2002, Index Data.
+ * Copyright (c) 1995-2003, Index Data.
  *
  * Permission to use, copy, modify, distribute, and sell this software and
  * its documentation, in whole or in part, for any purpose, is hereby granted,
@@ -23,18 +23,15 @@
  * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  *
- * $Id: odr-priv.h,v 1.1 2002-07-25 13:20:20 adam Exp $
+ * $Id: odr-priv.h,v 1.3 2003-01-06 08:20:27 adam Exp $
  */
 
 #ifndef ODR_PRIV_H
 
 #define ODR_PRIV_H
 
-#if HAVE_ICONV_H
-#include <iconv.h>
-#endif
-
 #include <yaz/odr.h>
+#include <yaz/yaz-util.h>
 
 struct Odr_ber_tag {      /* used to be statics in ber_tag... */
     int lclass;
@@ -50,9 +47,7 @@ struct Odr_private {
     odr_constack stack[ODR_MAX_STACK];
 
     struct Odr_ber_tag odr_ber_tag;
-#if HAVE_ICONV_H
-    iconv_t iconv_handle;
-#endif
+    yaz_iconv_t iconv_handle;
 };
 
 /* Private macro.