X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=include%2Foid.h;h=8feb61c135a80d42f69fb2f0523afb2fe8d4ba73;hp=b681a9d9eeb829d592d8967934115be8eda28218;hb=4ae699c927bc26f3550d1a8ca911e8d1fe75dbfc;hpb=0ba153ff51508cf37d3f5bbc48e3738dacfc6f42

diff --git a/include/oid.h b/include/oid.h
index b681a9d..8feb61c 100644
--- a/include/oid.h
+++ b/include/oid.h
@@ -24,7 +24,13 @@
  * OF THIS SOFTWARE.
  *
  * $Log: oid.h,v $
- * Revision 1.9  1995-10-12 10:34:45  quinn
+ * Revision 1.11  1996-01-02 08:57:30  quinn
+ * Changed enums in the ASN.1 .h files to #defines. Changed oident.class to oclass
+ *
+ * Revision 1.10  1995/11/13  09:27:31  quinn
+ * Fiddling with the variant stuff.
+ *
+ * Revision 1.9  1995/10/12  10:34:45  quinn
  * Added Espec-1.
  *
  * Revision 1.8  1995/10/10  16:27:08  quinn
@@ -63,93 +69,96 @@
 #include <yconfig.h>
 
 #define OID_SIZE 100
+    
+typedef enum oid_proto
+{
+    PROTO_Z3950,
+    PROTO_SR,
+    PROTO_GENERAL
+} oid_proto;
+
+typedef enum oid_class
+{
+    CLASS_APPCTX,
+    CLASS_ABSYN,
+    CLASS_ATTSET,
+    CLASS_TRANSYN,
+    CLASS_DIAGSET,
+    CLASS_RECSYN,
+    CLASS_RESFORM,
+    CLASS_ACCFORM,
+    CLASS_EXTSERV,
+    CLASS_USERINFO,
+    CLASS_ELEMSPEC,
+    CLASS_VARSET,
+    CLASS_SCHEMA,
+    CLASS_TAGSET
+} oid_class;
+
+typedef enum oid_value
+{
+    VAL_APDU,
+    VAL_BER,
+    VAL_BASIC_CTX,
+    VAL_BIB1,
+    VAL_EXP1,
+    VAL_EXT1,
+    VAL_CCL1,
+    VAL_GILS,
+    VAL_WAIS,
+    VAL_STAS,
+    VAL_DIAG1,
+    VAL_ISO2709,
+    VAL_UNIMARC,
+    VAL_INTERMARC,
+    VAL_CCF,
+    VAL_USMARC,
+    VAL_UKMARC,
+    VAL_NORMARC,
+    VAL_LIBRISMARC,
+    VAL_DANMARC,
+    VAL_FINMARC,
+    VAL_MAB,
+    VAL_CANMARC,
+    VAL_SBN,
+    VAL_PICAMARC,
+    VAL_AUSMARC,
+    VAL_IBERMARC,
+    VAL_EXPLAIN,
+    VAL_SUTRS,
+    VAL_OPAC,
+    VAL_SUMMARY,
+    VAL_GRS0,
+    VAL_GRS1,
+    VAL_EXTENDED,
+    VAL_RESOURCE1,
+    VAL_RESOURCE2,
+    VAL_PROMPT1,
+    VAL_DES1,
+    VAL_KRB1,
+    VAL_PRESSET,
+    VAL_PQUERY,
+    VAL_PCQUERY,
+    VAL_ITEMORDER,
+    VAL_DBUPDATE,
+    VAL_EXPORTSPEC,
+    VAL_EXPORTINV,
+    VAL_NONE,
+    VAL_SETM,
+    VAL_SETG,
+    VAL_VAR1,
+    VAL_ESPEC1
+} oid_value;
 
 typedef struct oident
 {
-    enum oid_proto
-    {
-    	PROTO_Z3950,
-	PROTO_SR,
-	PROTO_GENERAL
-    } proto;
-    enum oid_class
-    {
-    	CLASS_APPCTX,
-	CLASS_ABSYN,
-	CLASS_ATTSET,
-	CLASS_TRANSYN,
-	CLASS_DIAGSET,
-	CLASS_RECSYN,
-	CLASS_RESFORM,
-	CLASS_ACCFORM,
-	CLASS_EXTSERV,
-	CLASS_USERINFO,
-	CLASS_ELEMSPEC,
-	CLASS_VARSET,
-	CLASS_DBSCHEMA,
-	CLASS_TAGSET
-    } class;
-    enum oid_value
-    {
-    	VAL_APDU,
-	VAL_BER,
-	VAL_BASIC_CTX,
-	VAL_BIB1,
-	VAL_EXP1,
-	VAL_EXT1,
-	VAL_CCL1,
-	VAL_GILS,
-	VAL_STAS,
-	VAL_DIAG1,
-	VAL_ISO2709,
-	VAL_UNIMARC,
-	VAL_INTERMARC,
-	VAL_CCF,
-	VAL_USMARC,
-	VAL_UKMARC,
-	VAL_NORMARC,
-	VAL_LIBRISMARC,
-	VAL_DANMARC,
-	VAL_FINMARC,
-	VAL_MAB,
-	VAL_CANMARC,
-	VAL_SBN,
-	VAL_PICAMARC,
-	VAL_AUSMARC,
-	VAL_IBERMARC,
-	VAL_EXPLAIN,
-	VAL_SUTRS,
-	VAL_OPAC,
-	VAL_SUMMARY,
-	VAL_GRS0,
-	VAL_GRS1,
-	VAL_EXTENDED,
-	VAL_RESOURCE1,
-	VAL_RESOURCE2,
-	VAL_PROMPT1,
-	VAL_DES1,
-	VAL_KRB1,
-	VAL_PRESSET,
-	VAL_PQUERY,
-	VAL_PCQUERY,
-	VAL_ITEMORDER,
-	VAL_DBUPDATE,
-	VAL_EXPORTSPEC,
-	VAL_EXPORTINV,
-	VAL_NONE,
-	VAL_SETM,
-	VAL_SETG,
-	VAL_VAR1,
-	VAL_ESPEC1
-    } value;
+    oid_proto proto;
+    oid_class oclass;
+    oid_value value;
     int oidsuffix[20];
     char *desc;
 } oident;
 
-typedef enum oid_proto oid_proto;
-typedef enum oid_class oid_class;
-typedef enum oid_value oid_value;
-
 int *oid_getoidbyent(struct oident *ent);
 struct oident *oid_getentbyoid(int *o);
 void oid_oidcpy(int *t, int *s);