Using autoconf. New definitions: YAZ_BEGIN_CDECL/YAZ_END_CDECL.

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

diff --git a/include/yaz/oid.h b/include/yaz/oid.h
index d19d6a2..c0d5e40 100644 (file)
--- a/include/yaz/oid.h
+++ b/include/yaz/oid.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1995-1999, Index Data.
+ * Copyright (c) 1995-2000, 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,
@@ -23,7 +23,7 @@
  * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
  * OF THIS SOFTWARE.
  *
- * $Id: oid.h,v 1.3 2000-01-06 14:59:13 adam Exp $
+ * $Id: oid.h,v 1.5 2000-02-28 11:20:06 adam Exp $
  */
 
 #ifndef OID_H
@@ -31,9 +31,7 @@
 
 #include <yaz/yconfig.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+YAZ_BEGIN_CDECL
 
 #define OID_SIZE 20
     
@@ -155,6 +153,19 @@ typedef enum oid_value
     VAL_COOKIE,
     VAL_CLIENT_IP,
     VAL_ISO_ILL_1,
+    VAL_ZBIG,
+    VAL_UTIL,
+    VAL_XD1,
+    VAL_ZTHES,
+    VAL_FIN1,
+    VAL_DAN1,
+    VAL_DIAG_ES,
+    VAL_DIAG_GENERAL,
+    VAL_JPMARC,
+    VAL_SWEMARC,
+    VAL_SIGLEMARC,
+    VAL_ISDSMARC,
+    VAL_RUSMARC,
 /* add new types here... */
 
 /* VAL_DYNAMIC must have highest value */
@@ -186,8 +197,6 @@ YAZ_EXPORT struct oident *oid_addent (int *oid, enum oid_proto proto,
 YAZ_EXPORT void oid_init(void);
 YAZ_EXPORT void oid_exit(void);
 
-#ifdef __cplusplus
-}
-#endif
+YAZ_END_CDECL
 
 #endif