X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=include%2Fproto.h;h=ee49f355f531ad461a1c6321cbbb8f89290af7bb;hp=2366c903473ebbd0b2a03941fa0f70e4571d196e;hb=e37f1b24803ae41bba736eabdc14851018578abc;hpb=8bec24d252450a514ba47690ef187a76a29f8b47;ds=sidebyside

diff --git a/include/proto.h b/include/proto.h
index 2366c90..ee49f35 100644
--- a/include/proto.h
+++ b/include/proto.h
@@ -24,7 +24,11 @@
  * OF THIS SOFTWARE.
  *
  * $Log: proto.h,v $
- * Revision 1.28  1996-01-02 08:57:32  quinn
+ * Revision 1.29  1996-01-02 11:46:49  quinn
+ * Changed 'operator' to 'roperator' to avoid C++ conflict.
+ * Moved to pl3
+ *
+ * Revision 1.28  1996/01/02  08:57:32  quinn
  * Changed enums in the ASN.1 .h files to #defines. Changed oident.class to oclass
  *
  * Revision 1.27  1995/10/12  10:34:46  quinn
@@ -475,7 +479,7 @@ typedef struct Z_Complex
 {
     struct Z_RPNStructure *s1;
     struct Z_RPNStructure *s2;
-    Z_Operator *operator;
+    Z_Operator *roperator;
 } Z_Complex;
 
 typedef struct Z_RPNStructure