X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=util%2Fpquery.c;h=eccf10b0e33592a937dfb4330b5fffeb53337d21;hb=ab66367f19b935a874d190bbe5b5d8f20dbf3592;hp=f842788a6664768b313a754610936d9aeede2a7d;hpb=657fb99115b87a5244e9a33bbe4ca3d9d18849c4;p=yaz-moved-to-github.git

diff --git a/util/pquery.c b/util/pquery.c
index f842788..eccf10b 100644
--- a/util/pquery.c
+++ b/util/pquery.c
@@ -4,7 +4,13 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: pquery.c,v $
- * Revision 1.6  1995-09-27 15:03:03  quinn
+ * Revision 1.8  1996-01-02 11:46:56  quinn
+ * Changed 'operator' to 'roperator' to avoid C++ conflict.
+ *
+ * Revision 1.7  1995/09/29  17:12:36  quinn
+ * Smallish
+ *
+ * Revision 1.6  1995/09/27  15:03:03  quinn
  * Modified function heads & prototypes.
  *
  * Revision 1.5  1995/06/15  12:31:02  quinn
@@ -181,7 +187,7 @@ static Z_Complex *rpn_complex (ODR o, int num_attr, int max_attr,
 
     zc = odr_malloc (o, sizeof(*zc));
     zo = odr_malloc (o, sizeof(*zo));
-    zc->operator = zo;
+    zc->roperator = zo;
     switch (query_look)
     {
     case 'a':
@@ -248,7 +254,7 @@ static Z_RPNStructure *rpn_structure (ODR o, int num_attr, int max_attr,
     return sz;
 }
 
-Z_RPNQuery MDF *p_query_rpn (ODR o, const char *qbuf)
+Z_RPNQuery *p_query_rpn (ODR o, const char *qbuf)
 {
     Z_RPNQuery *zq;
     int attr_array[1024];
@@ -262,7 +268,7 @@ Z_RPNQuery MDF *p_query_rpn (ODR o, const char *qbuf)
     return zq;
 }
 
-Z_AttributesPlusTerm MDF *p_query_scan (ODR o, const char *qbuf)
+Z_AttributesPlusTerm *p_query_scan (ODR o, const char *qbuf)
 {
     int attr_list[1024];
     int num_attr = 0;