projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed output.
[yaz-moved-to-github.git]
/
util
/
pquery.c
diff --git
a/util/pquery.c
b/util/pquery.c
index
f842788
..
eccf10b
100644
(file)
--- a/
util/pquery.c
+++ b/
util/pquery.c
@@
-4,7
+4,13
@@
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: pquery.c,v $
* 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
* 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 = odr_malloc (o, sizeof(*zc));
zo = odr_malloc (o, sizeof(*zo));
- zc->operator = zo;
+ zc->roperator = zo;
switch (query_look)
{
case 'a':
switch (query_look)
{
case 'a':
@@
-248,7
+254,7
@@
static Z_RPNStructure *rpn_structure (ODR o, int num_attr, int max_attr,
return sz;
}
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];
{
Z_RPNQuery *zq;
int attr_array[1024];
@@
-262,7
+268,7
@@
Z_RPNQuery MDF *p_query_rpn (ODR o, const char *qbuf)
return zq;
}
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;
{
int attr_list[1024];
int num_attr = 0;