X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=include%2Fcomstack.h;h=ef2c1dd4ed2a111f7b8d2f82e13f897cccecaaf0;hb=9a2b41f58cf220c9583b654ff77776a18e958b44;hp=8e619cb54bfa9da8191833bd67a53d77d8e148e4;hpb=2004bbd9b3bbce5eb8ecc49520255b3d0bf578b9;p=yaz-moved-to-github.git

diff --git a/include/comstack.h b/include/comstack.h
index 8e619cb..ef2c1dd 100644
--- a/include/comstack.h
+++ b/include/comstack.h
@@ -24,7 +24,20 @@
  * OF THIS SOFTWARE.
  *
  * $Log: comstack.h,v $
- * Revision 1.13  1995-11-01 13:54:33  quinn
+ * 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
+ * Enable inetd operations fro TCP/IP stack
+ *
+ * Revision 1.13  1995/11/01  13:54:33  quinn
  * Minor adjustments
  *
  * Revision 1.12  1995/10/30  12:41:27  quinn
@@ -105,15 +118,20 @@
 #ifndef COMSTACK_H
 #define COMSTACK_H
 
+#define YNETINCLUDE
 #include <yconfig.h>
 #include <oid.h>
 #include <xmalloc.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define COMSTACK_DEFAULT_TIMEOUT -1  /* not used yet */
 
 struct comstack;
 typedef struct comstack *COMSTACK;
-typedef COMSTACK (*CS_TYPE)(int blocking, int protocol);
+typedef COMSTACK (*CS_TYPE)(int s, int blocking, int protocol);
 
 struct comstack
 {
@@ -122,7 +140,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
@@ -163,7 +181,9 @@ struct comstack
 #define cs_listen(handle, ap, al) ((*(handle)->f_listen)(handle, ap, al))
 #define cs_accept(handle) ((*(handle)->f_accept)(handle))
 #define cs_close(handle) ((*(handle)->f_close)(handle))
-#define cs_create(type, blocking, proto) ((*type)(blocking, proto))
+#define cs_create(type, blocking, proto) ((*type)(-1, blocking, proto))
+#define cs_createbysocket(sock, type, blocking, proto) \
+	((*type)(sock, blocking, proto))
 #define cs_type(handle) ((handle)->type)
 #define cs_fileno(handle) ((handle)->iofile)
 #define cs_stackerr(handle) ((handle)->stackerr)
@@ -172,8 +192,8 @@ struct comstack
 #define cs_getproto(handle) ((handle)->protocol)
 #define cs_addrstr(handle) ((*(handle)->f_addrstr)(handle))
 
-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.
@@ -185,10 +205,14 @@ const char *cs_errmsg(int n);
 #define CSNODATA   3
 #define CSWRONGBUF 4
 
-extern char *cs_errlist[];
+extern const char *cs_errlist[];
 
 /* backwards compatibility */
 #define CS_SR     PROTO_SR
 #define CS_Z3950  PROTO_Z3950
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif