X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fcharmap.c;h=8a5d2b8bc78917baba6a17f4f3eebe5f5e4fe739;hb=137b7070fefab44194e844b21d2e523c1c0f41a5;hp=6161a437b103dcf28b3addd14acec03af2bb9ddb;hpb=eab4cdc5571ca8811ebaae09358b223b7debc02f;p=idzebra-moved-to-github.git

diff --git a/util/charmap.c b/util/charmap.c
index 6161a43..8a5d2b8 100644
--- a/util/charmap.c
+++ b/util/charmap.c
@@ -1,6 +1,6 @@
-/* $Id: charmap.c,v 1.32 2004-12-10 11:56:23 heikki Exp $
-   Copyright (C) 1995,1996,1997,1998,1999,2000,2001,2002,2003,2004
-   Index Data Aps
+/* $Id: charmap.c,v 1.35 2005-01-16 23:14:58 adam Exp $
+   Copyright (C) 1995-2005
+   Index Data ApS
 
 This file is part of the Zebra server.
 
@@ -29,25 +29,14 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 #include <ctype.h>
 #include <string.h>
+#include <stdlib.h>
 #include <assert.h>
 
 typedef unsigned ucs4_t;
 
 #include <charmap.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 <yaz/yaz-util.h>
 
 #define CHR_MAXSTR 1024
 #define CHR_MAXEQUIV 32