X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fproto.h;h=fa68a87943122a6d5da55fd926c36d799ef0a519;hb=101d89d1a26a27c93115a68af84e9c72beb1abd6;hp=f536d832d54a339fa639c7ce703271b9238bbda5;hpb=54605527769927a70af506babc5d663a6caf7e64;p=yaz-moved-to-github.git

diff --git a/include/proto.h b/include/proto.h
index f536d83..fa68a87 100644
--- a/include/proto.h
+++ b/include/proto.h
@@ -24,7 +24,13 @@
  * OF THIS SOFTWARE.
  *
  * $Log: proto.h,v $
- * Revision 1.9  1995-05-22 11:31:25  quinn
+ * Revision 1.11  1995-06-02 09:49:47  quinn
+ * Add access control
+ *
+ * Revision 1.10  1995/05/29  08:11:34  quinn
+ * Moved oid from odr/asn to util.
+ *
+ * Revision 1.9  1995/05/22  11:31:25  quinn
  * Added PDUs
  *
  * Revision 1.8  1995/05/17  08:41:35  quinn
@@ -88,6 +94,7 @@
 #define PROTO_H
 
 #include <odr.h>
+#include <oid.h>
 #include <odr_use.h>
 
 /* ----------------- GLOBAL AUXILIARY DEFS ----------------*/
@@ -120,7 +127,7 @@ typedef struct Z_OtherInformationUnit
 	Odr_oct *binaryInfo;
 	Odr_external *externallyDefinedInfo;
 	Odr_oid *oid;
-    } u;
+    } information;
 } Z_OtherInformationUnit;
 
 typedef struct Z_OtherInformation
@@ -129,6 +136,34 @@ typedef struct Z_OtherInformation
     Z_OtherInformationUnit **list;
 } Z_OtherInformation;
 
+typedef struct Z_StringOrNumeric
+{
+    enum
+    {
+    	Z_StringOrNumeric_string,
+	Z_StringOrNumeric_numeric
+    } which;
+    union
+    {
+    	char *string;
+	int *numeric;
+    } u;
+} Z_StringOrNumeric;
+
+typedef struct Z_Unit
+{
+    char *unitSystem;               /* OPTIONAL */
+    Z_StringOrNumeric *unitType;    /* OPTIONAL */
+    Z_StringOrNumeric *unit;        /* OPTIONAL */
+    int *scaleFactor;               /* OPTIONAL */
+} Z_Unit;
+
+typedef struct Z_IntUnit
+{
+    int *value;
+    Z_Unit *unitUsed;
+} Z_IntUnit;
+
 /* ----------------- INIT SERVICE  ----------------*/
 
 typedef struct
@@ -784,4 +819,7 @@ Z_ResourceControlRequest *zget_ResourceControlRequest(ODR o);
 Z_ResourceControlResponse *zget_ResourceControlResponse(ODR o);
 Z_APDU *zget_APDU(ODR o, enum Z_APDU_which which);
 
+#include <prt-rsc.h>
+#include <prt-acc.h>
+
 #endif