Not using the deprecated yaz-util.h any more

[idzebra-moved-to-github.git] / include / zebrautl.h

diff --git a/include/zebrautl.h b/include/zebrautl.h
index dd5ae6a..9b1daf9 100644 (file)
--- a/include/zebrautl.h
+++ b/include/zebrautl.h
@@ -1,5 +1,5 @@
-/* $Id: zebrautl.h,v 1.7 2002-08-02 19:26:55 adam Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002
+/* $Id: zebrautl.h,v 1.11 2004-12-10 11:56:21 heikki Exp $
+   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
    Index Data Aps
 
 This file is part of the Zebra server.
@@ -20,13 +20,32 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 02111-1307, USA.
 */
 
-
-
 #ifndef ZEBRA_UTIL_H
 #define ZEBRA_UTIL_H
 
-#include <yaz/yaz-util.h>
-#include <res.h>
-#include <zebraver.h>
+/* Old yaz-util includes */
+#include <yaz/yconfig.h>
+#include <yaz/yaz-version.h>
+#include <yaz/xmalloc.h>
+#include <yaz/ylog.h>  
+#include <yaz/tpath.h>
+#include <yaz/options.h>
+#include <yaz/wrbuf.h>
+#include <yaz/nmem.h>
+#include <yaz/readconf.h>
+#include <yaz/marcdisp.h>
+#include <yaz/yaz-iconv.h>
+
+#include <idzebra/res.h>
+#include <idzebra/version.h>
+
+/* check that we don't have all too old yaz */
+#ifndef YLOG_ERRNO
+#error Need a modern yaz with ylog.h
+#endif
+
+YAZ_BEGIN_CDECL
+zint atoi_zn (const char *buf, zint len);
+YAZ_END_CDECL
 
 #endif