X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fyaz%2Fyaz-util.h;h=2c47f44a7e28931b047d3c74efb425f23af56bef;hb=ba8d526ec24077c455979314147aaff20746a8ca;hp=c6f30199a443ccb918df0956b05ea6e4f5f89b19;hpb=d9ee01635f03f9095a66f71b73580560d48798e8;p=yaz-moved-to-github.git

diff --git a/include/yaz/yaz-util.h b/include/yaz/yaz-util.h
index c6f3019..2c47f44 100644
--- a/include/yaz/yaz-util.h
+++ b/include/yaz/yaz-util.h
@@ -1,36 +1,16 @@
 /*
- * Copyright (c) 1995-1997, Index Data.
+ * Copyright (c) 1995-2003, Index Data.
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
- * $Log: yaz-util.h,v $
- * Revision 1.1  1999-11-30 13:47:11  adam
- * Improved installation. Moved header files to include/yaz.
- *
- * Revision 1.6  1997/10/27 13:52:46  adam
- * Header yaz-util includes all YAZ utility header files.
- *
- * Revision 1.5  1997/09/04 07:58:36  adam
- * Added prototype for atoi_n.
- *
- * Revision 1.4  1997/09/01 08:49:54  adam
- * New windows NT/95 port using MSV5.0. To export DLL functions the
- * YAZ_EXPORT modifier was added. Defined in yconfig.h.
- *
- * Revision 1.3  1997/05/14 06:53:54  adam
- * C++ support.
- *
- * Revision 1.2  1996/02/20 17:58:09  adam
- * Added const to yaz_matchstr.
- *
- * Revision 1.1  1996/02/20  16:32:49  quinn
- * Created util file.
+ * $Id: yaz-util.h,v 1.9 2003-02-18 14:28:52 adam Exp $
  */
 
 #ifndef YAZ_UTIL_H
 #define YAZ_UTIL_H
 
 #include <yaz/yconfig.h>
+#include <yaz/yaz-version.h>
 #include <yaz/xmalloc.h>
 #include <yaz/log.h>
 #include <yaz/tpath.h>
@@ -38,16 +18,7 @@
 #include <yaz/wrbuf.h>
 #include <yaz/nmem.h>
 #include <yaz/readconf.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-YAZ_EXPORT int yaz_matchstr(const char *s1, const char *s2);
-YAZ_EXPORT int atoi_n (const char *buf, int len);
-
-#ifdef __cplusplus
-}
-#endif
+#include <yaz/marcdisp.h>
+#include <yaz/yaz-iconv.h>
 
 #endif