Changed enums in the ASN.1 .h files to #defines. Changed oident.class to oclass

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

diff --git a/include/prt-ext.h b/include/prt-ext.h
index a04b2e3..9e1f48f 100644 (file)
--- a/include/prt-ext.h
+++ b/include/prt-ext.h
@@ -29,22 +29,32 @@
  * Biased-choice External for Z39.50.
  */
 
+#ifndef PRT_EXT_H
+#define PRT_EXT_H
+
+#include <yconfig.h>
+
 struct Z_External
 {
     Odr_oid *direct_reference;
     int *indirect_reference;
     char *descriptor;
-    enum
-    {
-       /* Generic types */
-       Z_External_single = 0,
-       Z_External_octet,
-       Z_External_arbitrary,
-
-       /* Specific types */
-       Z_External_SUTRS,
-       Z_External_explainRecord
-    } which;
+    int which;
+/* Generic types */
+#define Z_External_single 0
+#define Z_External_octet 1
+#define Z_External_arbitrary 2
+/* Specific types */
+#define Z_External_sutrs 3
+#define Z_External_explainRecord 4
+#define Z_External_resourceReport1 5
+#define Z_External_resourceReport2 6
+#define Z_External_promptObject1 7
+#define Z_External_grs1 8
+#define Z_External_extendedService 9
+#define Z_External_itemOrder 10
+#define Z_External_diag1 11
+#define Z_External_espec1 12
     union
     {
        /* Generic types */
@@ -55,7 +65,17 @@ struct Z_External
        /* Specific types */
        Z_SUTRS *sutrs;
        Z_ExplainRecord *explainRecord;
+       Z_ResourceReport1 *resourceReport1;
+       Z_ResourceReport2 *resourceReport2;
+       Z_PromptObject1 *promptObject1;
+       Z_GenericRecord *grs1;
+       Z_TaskPackage *extendedService;
+       Z_ItemOrder *itemOrder;
+       Z_DiagnosticFormat *diag1;
+       Z_Espec1 *espec1;
     } u;
 };
 
 int z_External(ODR o, Z_External **p, int opt);
+
+#endif