Updated.

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

diff --git a/include/comstack.h b/include/comstack.h
index e9cda33..13f7369 100644 (file)
--- a/include/comstack.h
+++ b/include/comstack.h
@@ -24,7 +24,20 @@
  * OF THIS SOFTWARE.
  *
  * $Log: comstack.h,v $
- * Revision 1.15  1996-07-06 19:58:32  quinn
+ * Revision 1.19  1997-09-29 07:16:14  adam
+ * Array cs_errlist no longer global.
+ *
+ * Revision 1.18  1997/09/17 12:10:31  adam
+ * YAZ version 1.4.
+ *
+ * Revision 1.17  1997/09/01 08:49:47  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.16  1997/05/14 06:53:37  adam
+ * C++ support.
+ *
+ * Revision 1.15  1996/07/06 19:58:32  quinn
  * System headerfiles gathered in yconfig
  *
  * Revision 1.14  1996/02/10  12:23:41  quinn
@@ -116,6 +129,10 @@
 #include <oid.h>
 #include <xmalloc.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define COMSTACK_DEFAULT_TIMEOUT -1  /* not used yet */
 
 struct comstack;
@@ -129,7 +146,7 @@ struct comstack
     char *stackerr;/* current lower-layer error string, or null if none */
     int iofile;    /* UNIX file descriptor for iochannel */
     int timeout;   /* how long to wait for trailing blocks (ignored for now) */
-    void *private; /* state info for lower stack */
+    void *cprivate;/* state info for lower stack */
     int more;      /* connection has extra data in buffer */
     int state;     /* current state */
 #define CS_UNBND      0
@@ -159,6 +176,7 @@ struct comstack
     COMSTACK (*f_accept)(COMSTACK handle);
     int (*f_close)(COMSTACK handle);
     char *(*f_addrstr)(COMSTACK handle);
+    void *(*f_straddr)(COMSTACK handle, const char *str);
 };
 
 #define cs_put(handle, buf, size) ((*(handle)->f_put)(handle, buf, size))
@@ -180,9 +198,10 @@ struct comstack
 #define cs_errno(handle) ((handle)->cerrno)
 #define cs_getproto(handle) ((handle)->protocol)
 #define cs_addrstr(handle) ((*(handle)->f_addrstr)(handle))
+#define cs_straddr(handle, str) ((*(handle)->f_straddr)(handle, str))
 
-const char *cs_strerror(COMSTACK h);
-const char *cs_errmsg(int n);
+YAZ_EXPORT const char *cs_strerror(COMSTACK h);
+YAZ_EXPORT const char *cs_errmsg(int n);
 
 /*
  * error management.
@@ -194,10 +213,12 @@ const char *cs_errmsg(int n);
 #define CSNODATA   3
 #define CSWRONGBUF 4
 
-extern char *cs_errlist[];
-
 /* backwards compatibility */
 #define CS_SR     PROTO_SR
 #define CS_Z3950  PROTO_Z3950
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif