Fix log messages

[idzebra-moved-to-github.git] / index / index.h

diff --git a/index/index.h b/index/index.h
index 3e532ff..ccb2714 100644 (file)
--- a/index/index.h
+++ b/index/index.h
@@ -1,9 +1,26 @@
-/*
- * Copyright (C) 1995-2002, Index Data
- * All rights reserved.
- * Sebastian Hammer, Adam Dickmeiss, Heikki Levanto
- * $Id: index.h,v 1.84 2002-07-25 13:06:43 adam Exp $
- */
+/* $Id: index.h,v 1.86 2002-08-28 19:52:29 adam Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+   Index Data Aps
+
+This file is part of the Zebra server.
+
+Zebra is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Zebra is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+You should have received a copy of the GNU General Public License
+along with Zebra; see the file LICENSE.zebra.  If not, write to the
+Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
+02111-1307, USA.
+*/
+
+
 
 #ifndef INDEX_H
 #define INDEX_H
@@ -18,10 +35,6 @@
 #include <sys/times.h>
 #endif
 
-#if HAVE_ICONV_H
-#include <iconv.h>
-#endif
-
 #include <dict.h>
 #include <isams.h>
 #include <isam.h>
@@ -286,10 +299,9 @@ struct zebra_session {
     int records_deleted;
     int records_processed;
     char *record_encoding;
-#if HAVE_ICONV_H
-    iconv_t iconv_to_utf8;
-    iconv_t iconv_from_utf8;
-#endif
+
+    yaz_iconv_t iconv_to_utf8;
+    yaz_iconv_t iconv_from_utf8;
 };
 
 struct rank_control {