X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=asn%2Fproto.c;h=b654eacd4ed711506b27686e929d4f9075e04c83;hb=e37f1b24803ae41bba736eabdc14851018578abc;hp=b50e132dbca78ea5c63185b0a6d78e5bbc59d368;hpb=7f4183f05884c781eb395a17e4282485c618ded6;p=yaz-moved-to-github.git

diff --git a/asn/proto.c b/asn/proto.c
index b50e132..b654eac 100644
--- a/asn/proto.c
+++ b/asn/proto.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: proto.c,v $
- * Revision 1.37  1995-08-21 09:10:15  quinn
+ * Revision 1.40  1996-01-02 11:46:40  quinn
+ * Changed 'operator' to 'roperator' to avoid C++ conflict.
+ *
+ * Revision 1.39  1995/09/29  17:11:53  quinn
+ * Smallish
+ *
+ * Revision 1.38  1995/09/27  15:02:40  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.37  1995/08/21  09:10:15  quinn
  * Smallish fixes to suppport new formats.
  *
  * Revision 1.36  1995/08/15  11:59:39  quinn
@@ -655,7 +664,7 @@ int z_Complex(ODR o, Z_Complex **p, int opt)
     return
     	z_RPNStructure(o, &(*p)->s1, 0) &&
     	z_RPNStructure(o, &(*p)->s2, 0) &&
-    	z_Operator(o, &(*p)->operator, 0) &&
+    	z_Operator(o, &(*p)->roperator, 0) &&
     	odr_sequence_end(o);
 }