Changed code so that it compiles as C++.

[yaz-moved-to-github.git] / include / prt-exp.h

diff --git a/include/prt-exp.h b/include/prt-exp.h
index 9fdd806..832763b 100644 (file)
--- a/include/prt-exp.h
+++ b/include/prt-exp.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995, Index Data.
+ * Copyright (c) 1995-1998, Index Data.
  *
  * Permission to use, copy, modify, distribute, and sell this software and
  * its documentation, in whole or in part, for any purpose, is hereby granted,
@@ -30,6 +30,10 @@
 
 #include <yconfig.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define multipleDbSearch multipleDBsearch
 
 typedef struct Z_CommonInfo
@@ -114,7 +118,7 @@ typedef struct Z_NetworkAddress
 
 typedef struct Z_PrivateCapOperator
 {
-    char *operator;
+    char *roperator;
     Z_HumanString *description;             /* OPTIONAL */
 } Z_PrivateCapOperator;
     
@@ -147,8 +151,8 @@ typedef struct Z_ProxSupportUnit
 #define Z_ProxSupportUnit_private 1
     union
     {
-       int known;
-       Z_ProxSupportPrivate *private;
+       int *known;
+       Z_ProxSupportPrivate *zprivate;
     } u;
 } Z_ProxSupportUnit;
 
@@ -186,7 +190,7 @@ typedef struct Z_QueryTypeDetails
 #define Z_QueryTypeDetails_rankedList 5
     union
     {
-       Z_PrivateCapabilities *private;
+       Z_PrivateCapabilities *zprivate;
        Z_RpnCapabilities *rpn;
        Z_Iso8777Capabilities *iso8777;
        Z_HumanString *z3958;
@@ -287,7 +291,7 @@ typedef struct Z_AttributeOccurrence
     {
        Odr_null *anyOrNone;
        Z_AttributeValueList *specific;
-    } *attributeValues;
+    } attributeValues;
 } Z_AttributeOccurrence;
 
 typedef struct Z_AttributeCombination
@@ -995,6 +999,10 @@ typedef struct Z_ExplainRecord
     } u;
 } Z_ExplainRecord;
 
-int z_ExplainRecord(ODR o, Z_ExplainRecord **p, int opt);
+YAZ_EXPORT int z_ExplainRecord(ODR o, Z_ExplainRecord **p, int opt);
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif