X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=zutil%2Fquery.c;h=a3b8338f34716e8928cb5ad98a87c35070e3f234;hb=c39a893dfdae5f792139177132e7e7a70e010aa7;hp=4ad90da16802c375ce2aa6517ca0b4687b7a4b64;hpb=1a9b27497a71eafda912d0d4a9069bc61fa5455e;p=yaz-moved-to-github.git

diff --git a/zutil/query.c b/zutil/query.c
index 4ad90da..a3b8338 100644
--- a/zutil/query.c
+++ b/zutil/query.c
@@ -1,33 +1,16 @@
 /*
- * Copyright (c) 1995-1999, Index Data
+ * Copyright (c) 1995-2001, Index Data
  * See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
- *
- * $Log: query.c,v $
- * Revision 1.2  1999-06-09 14:01:33  adam
- * Fixed for compiled ASN.1.
- *
- * Revision 1.1  1999/06/08 10:10:16  adam
- * New sub directory zutil. Moved YAZ Compiler to be part of YAZ tree.
- *
- * Revision 1.3  1996/01/02 11:46:56  quinn
- * Changed 'operator' to 'roperator' to avoid C++ conflict.
- *
- * Revision 1.2  1995/05/16  08:51:14  quinn
- * License, documentation, and memory fixes
- *
- * Revision 1.1  1995/04/10  10:28:47  quinn
- * Added copy of CCL and MARC display
- *
  *
+ * $Id: query.c,v 1.4 2001-11-13 23:00:43 adam Exp $
  */
 
 #include <stdio.h>
 #include <ctype.h>
 #include <string.h>
 
-#include <odr.h>
-#include <proto.h>
+#include <yaz/odr.h>
+#include <yaz/proto.h>
 
 static Z_Complex *makecomplex(ODR o, char **buf);
 static Z_Operand *makesimple(ODR o, char **buf);
@@ -64,14 +47,9 @@ static Z_Operand *makesimple(ODR o, char **buf)
     (*buf)++;
     r->which = Z_Operand_APT;
     r->u.attributesPlusTerm = t = odr_malloc(o, sizeof(*t));
-#ifdef ASN_COMPILED
     t->attributes = odr_malloc(o, sizeof(*t));
     t->attributes->num_attributes = 0;
     t->attributes->attributes = 0;
-#else
-    t->num_attributes = 0;
-    t->attributeList = 0;
-#endif
     t->term = odr_malloc(o, sizeof(*t->term));
     t->term->which = Z_Term_general;
     t->term->u.general = odr_malloc(o, sizeof(Odr_oct));