X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fprt-acc.h;h=1f4bdcacf34f06828c419137e62e87c5787c2a0f;hb=4e664c278636002a3a0c7897d233a258ac1ec18d;hp=999a43021eddd38ac35529e879eeafa7da11f513;hpb=11fc1fa1b5e4b75942018efe466dbfdb41454077;p=yaz-moved-to-github.git

diff --git a/include/prt-acc.h b/include/prt-acc.h
index 999a430..1f4bdca 100644
--- a/include/prt-acc.h
+++ b/include/prt-acc.h
@@ -24,7 +24,27 @@
  * OF THIS SOFTWARE.
  *
  * $Log: prt-acc.h,v $
- * Revision 1.3  1995-08-17 12:45:16  quinn
+ * Revision 1.9  1999-04-20 09:56:48  adam
+ * Added 'name' paramter to encoder/decoder routines (typedef Odr_fun).
+ * Modified all encoders/decoders to reflect this change.
+ *
+ * Revision 1.8  1997/09/01 08:49:51  adam
+ * New windows NT/95 port using MSV5.0. To export DLL functions the
+ * YAZ_EXPORT modifier was added. Defined in yconfig.h.
+ *
+ * Revision 1.7  1997/05/14 06:53:46  adam
+ * C++ support.
+ *
+ * Revision 1.6  1996/01/02 08:57:35  quinn
+ * Changed enums in the ASN.1 .h files to #defines. Changed oident.class to oclass
+ *
+ * Revision 1.5  1995/09/29  17:12:09  quinn
+ * Smallish
+ *
+ * Revision 1.4  1995/09/27  15:02:49  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.3  1995/08/17  12:45:16  quinn
  * Fixed minor problems with GRS-1. Added support in c&s.
  *
  * Revision 1.2  1995/08/15  12:00:13  quinn
@@ -36,6 +56,13 @@
  *
  */
 
+#ifndef PRT_ACC_H
+#define PRT_ACC_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef struct Z_Encryption1
 {
     Odr_oct *cryptType;       /* OPTIONAL */
@@ -56,11 +83,9 @@ typedef struct Z_EnumeratedPrompt1
 
 typedef struct Z_PromptId1
 {
-    enum
-    {
-    	Z_PromptId1_enumeratedPrompt,
-	Z_PromptId1_nonEnumeratedPrompt
-    } which;
+    int which;
+#define Z_PromptId1_enumeratedPrompt 0
+#define Z_PromptId1_nonEnumeratedPrompt 1
     union
     {
     	Z_EnumeratedPrompt1 *enumeratedPrompt;
@@ -70,11 +95,9 @@ typedef struct Z_PromptId1
 
 typedef struct Z_PromptInfo1
 {
-    enum
-    {
-    	Z_Challenge1_character,
-	Z_Challenge1_encrypted
-    } which;
+    int which;
+#define Z_Challenge1_character 0
+#define Z_Challenge1_encrypted 1
     union
     {
     	char *character;
@@ -111,14 +134,12 @@ typedef struct Z_Challenge1
 typedef struct Z_ResponseUnit1
 {
     Z_PromptId1 *promptId;
-    enum
-    {
-    	Z_Response1_string,
-	Z_Response1_accept,
-	Z_Response1_acknowledge,
-	Z_Response1_diagnostic,
-	Z_Response1_encrypted
-    } which;
+    int which;
+#define Z_Response1_string 0
+#define Z_Response1_accept 1
+#define Z_Response1_acknowledge 2
+#define Z_Response1_diagnostic 3
+#define Z_Response1_encrypted 4
     union
     {
     	char *string;
@@ -137,11 +158,9 @@ typedef struct Z_Response1
 
 typedef struct Z_PromptObject1
 {
-    enum
-    {
-    	Z_PromptObject1_challenge,
-	Z_PromptObject1_response
-    } which;
+    int which;
+#define Z_PromptObject1_challenge 0
+#define Z_PromptObject1_response 1
     union
     {
     	Z_Challenge1 *challenge;
@@ -149,4 +168,11 @@ typedef struct Z_PromptObject1
     } u;
 } Z_PromptObject1;
 
-int z_PromptObject1(ODR o, Z_PromptObject1 **p, int opt);
+YAZ_EXPORT int z_PromptObject1(ODR o, Z_PromptObject1 **p, int opt,
+			       const char *name);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif