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

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

diff --git a/include/prt-exd.h b/include/prt-exd.h
index 34dad37..97531b9 100644 (file)
--- a/include/prt-exd.h
+++ b/include/prt-exd.h
@@ -50,7 +50,7 @@ typedef struct Z_TaskPackage
     Z_External *taskSpecificParameters;   
 } Z_TaskPackage;
 
-int MDF z_TaskPackage(ODR o, Z_TaskPackage **p, int opt);
+int z_TaskPackage(ODR o, Z_TaskPackage **p, int opt);
 
 /* ----------------------- ITEM ORDER ------------------------- */
 
@@ -94,16 +94,14 @@ typedef struct Z_IOCreditCardInfo
 
 typedef struct Z_IOBilling
 {
-    enum
-    {
-       Z_IOBilling_billInvoice,
-       Z_IOBilling_prepay,
-       Z_IOBilling_depositAccount,
-       Z_IOBilling_creditCard,
-       Z_IOBilling_cardInfoPreviouslySupplied,
-       Z_IOBilling_privateKnown,
-       Z_IOBilling_privateNotKnown
-    } which;
+    int which;
+#define Z_IOBilling_billInvoice 0
+#define Z_IOBilling_prepay 1
+#define Z_IOBilling_depositAccount 2
+#define Z_IOBilling_creditCard 3
+#define Z_IOBilling_cardInfoPreviouslySupplied 4
+#define Z_IOBilling_privateKnown 5
+#define Z_IOBilling_privateNotKnown 6
     union
     {
        Odr_null *noinfo;
@@ -135,11 +133,9 @@ typedef struct Z_IOTaskPackage
 
 typedef struct Z_ItemOrder
 {
-    enum
-    {
-       Z_ItemOrder_esRequest,
-       Z_ItemOrder_taskPackage
-    } which;
+    int which;
+#define Z_ItemOrder_esRequest 0
+#define Z_ItemOrder_taskPackage 1
     union
     {
        Z_IORequest *esRequest;
@@ -147,6 +143,6 @@ typedef struct Z_ItemOrder
     } u;
 } Z_ItemOrder;
 
-int MDF z_ItemOrder(ODR o, Z_ItemOrder **p, int opt);
+int z_ItemOrder(ODR o, Z_ItemOrder **p, int opt);
 
 #endif