X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=recctrl%2Fmarcomp.c;h=23b4044edc274b3c7d32cccbdb8b09a03ed7f256;hb=9b9f570a2960c2c8a7026b2faee943794b08ce49;hp=fa898ba6a3fe20f35ba7e6a4947e0af2cfe282cb;hpb=eab4cdc5571ca8811ebaae09358b223b7debc02f;p=idzebra-moved-to-github.git

diff --git a/recctrl/marcomp.c b/recctrl/marcomp.c
index fa898ba..23b4044 100644
--- a/recctrl/marcomp.c
+++ b/recctrl/marcomp.c
@@ -1,5 +1,5 @@
 /*
-    $Id: marcomp.c,v 1.3 2004-12-10 11:56:22 heikki Exp $
+    $Id: marcomp.c,v 1.5 2005-01-03 19:27:53 adam Exp $
 
     marcomp.c - compiler of MARC statements.
 */
@@ -9,19 +9,7 @@
 #include <string.h>
 #include <ctype.h>
 
-
-/* Old yaz-util includes (FIXME - clean up what is not needed)*/
-#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>
 
 #include "marcomp.h"
 
@@ -100,7 +88,8 @@ mc_token mc_gettoken(mc_context *c)
 	case '[': c->crrtok = LINTERVAL; break;
 	case ']': c->crrtok = RINTERVAL; break;
 	default:
-	    if (isspace(*(c->data+c->offset)) || *(c->data+c->offset) == '\n')
+	    if (isspace(*(unsigned char *) (c->data+c->offset)) 
+			    || *(c->data+c->offset) == '\n')
 	    {
 		c->crrtok = NOP;
 	    }