X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=include%2Fcomstack.h;h=ef2c1dd4ed2a111f7b8d2f82e13f897cccecaaf0;hb=542c22e17883f15a72d783371891b492cbd4b80c;hp=2c8b4bde841af48f8036602e15fec4bb69588060;hpb=9d17b5cfa8555d4762f162785edede1e0314cc07;p=yaz-moved-to-github.git diff --git a/include/comstack.h b/include/comstack.h index 2c8b4bd..ef2c1dd 100644 --- a/include/comstack.h +++ b/include/comstack.h @@ -24,7 +24,17 @@ * OF THIS SOFTWARE. * * $Log: comstack.h,v $ - * Revision 1.14 1996-02-10 12:23:41 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 @@ -108,10 +118,15 @@ #ifndef COMSTACK_H #define COMSTACK_H +#define YNETINCLUDE #include #include #include +#ifdef __cplusplus +extern "C" { +#endif + #define COMSTACK_DEFAULT_TIMEOUT -1 /* not used yet */ struct comstack; @@ -125,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 @@ -177,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. @@ -190,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