Windows-support changes

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

diff --git a/include/comstack.h b/include/comstack.h
index 304b6cf..e6a5627 100644 (file)
--- a/include/comstack.h
+++ b/include/comstack.h
@@ -24,7 +24,22 @@
  * OF THIS SOFTWARE.
  *
  * $Log: comstack.h,v $
- * Revision 1.4  1995-05-16 08:50:29  quinn
+ * Revision 1.9  1995-09-28 10:12:36  quinn
+ * Windows-support changes
+ *
+ * Revision 1.8  1995/09/27  15:02:46  quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.7  1995/06/19  12:38:24  quinn
+ * Reorganized include-files. Added small features.
+ *
+ * Revision 1.6  1995/05/30  10:54:51  quinn
+ * Added some backwards compatibility to the comstack (CS_SR->PROTO_SR)
+ *
+ * Revision 1.5  1995/05/29  08:11:31  quinn
+ * Moved oid from odr/asn to util.
+ *
+ * Revision 1.4  1995/05/16  08:50:29  quinn
  * License, documentation, and memory fixes
  *
  * Revision 1.3  1995/04/20  15:12:44  quinn
@@ -78,9 +93,11 @@
 #ifndef COMSTACK_H
 #define COMSTACK_H
 
+#include <yconfig.h>
+#include <oid.h>
 #include <dmalloc.h>
 
-#define COMSTACK_DEFAULT_TIMEOUT -1
+#define COMSTACK_DEFAULT_TIMEOUT -1  /* not used yet */
 
 struct comstack;
 typedef struct comstack *COMSTACK;
@@ -89,10 +106,10 @@ typedef COMSTACK (*CS_TYPE)(int blocking, int protocol);
 struct comstack
 {
     CS_TYPE type;
-    int errno;     /* current error code of this stack */
+    int cerrno;     /* current error code of this stack */
     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 */          
+    int timeout;   /* how long to wait for trailing blocks (ignored for now) */
     void *private; /* state info for lower stack */
     int more;      /* connection has extra data in buffer */
     int state;     /* current state */
@@ -109,9 +126,7 @@ struct comstack
 #define CS_DISCON     2
 #define CS_LISTEN     3
 #define CS_DATA       4
-    int protocol;  /* what application protocol are we talking? */
-#define CS_Z3950      0
-#define CS_SR         1
+    enum oid_proto protocol;  /* what application protocol are we talking? */
     int (*f_look)(COMSTACK handle);
     int (*f_put)(COMSTACK handle, char *buf, int size);
     int (*f_get)(COMSTACK handle, char **buf, int *bufsize);
@@ -140,10 +155,10 @@ struct comstack
 #define cs_fileno(handle) ((handle)->iofile)
 #define cs_stackerr(handle) ((handle)->stackerr)
 #define cs_getstate(handle) ((handle)->getstate)
-#define cs_errno(handle) ((handle)->errno)
+#define cs_errno(handle) ((handle)->cerrno)
 #define cs_getproto(handle) ((handle)->protocol)
 
-const char *cs_strerror(COMSTACK h);
+const char MDF *cs_strerror(COMSTACK h);
 
 /*
  * error management.
@@ -157,4 +172,8 @@ const char *cs_strerror(COMSTACK h);
 
 extern char *cs_errlist[];
 
+/* backwards compatibility */
+#define CS_SR     PROTO_SR
+#define CS_Z3950  PROTO_Z3950
+
 #endif