X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=comstack%2Fxmosi.c;h=ea8a71b0f47e597793c23b781fd394e4d2b3b7f0;hb=542c22e17883f15a72d783371891b492cbd4b80c;hp=43797cf7048922252b03ece3881dd3389d57f770;hpb=214a19efbb9f3ccb3cfe678b5c9ba805774b3d12;p=yaz-moved-to-github.git

diff --git a/comstack/xmosi.c b/comstack/xmosi.c
index 43797cf..ea8a71b 100644
--- a/comstack/xmosi.c
+++ b/comstack/xmosi.c
@@ -4,7 +4,19 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: xmosi.c,v $
- * Revision 1.11  1996-02-23 10:00:41  quinn
+ * Revision 1.15  1997-05-14 06:53:34  adam
+ * C++ support.
+ *
+ * Revision 1.14  1996/07/26 12:34:07  quinn
+ * Porting.
+ *
+ * Revision 1.13  1996/07/06  19:58:30  quinn
+ * System headerfiles gathered in yconfig
+ *
+ * Revision 1.12  1996/05/22  08:34:44  adam
+ * Added ifdef USE_XTIMOSI; so that 'make depend' works.
+ *
+ * Revision 1.11  1996/02/23 10:00:41  quinn
  * WAIS Work
  *
  * Revision 1.10  1996/02/10  12:23:13  quinn
@@ -89,6 +101,7 @@
  *
  */
 
+#ifdef USE_XTIMOSI
 /*
  * Glue layer for Peter Furniss' xtimosi package.
  */
@@ -98,11 +111,16 @@
 #include <string.h>
 #include <assert.h>
 
+<<<<<<< 1.13
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netdb.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
+=======
+#define YNETINCLUDE
+#include <yconfig.h>
+>>>>>>> /tmp/T4a00144
 
 #include <comstack.h>
 #include <xmosi.h>
@@ -171,7 +189,7 @@ COMSTACK mosi_type(int s, int blocking, int protocol)
 
     if (!(r = xmalloc(sizeof(*r))))
     	return 0;
-    if (!(state = r->private = xmalloc(sizeof(*state))))
+    if (!(state = r->cprivate = xmalloc(sizeof(*state))))
     	return 0;
 
     state->call = 0;
@@ -376,7 +394,7 @@ int mosi_bind(COMSTACK h, void *address, int mode)
 int mosi_listen(COMSTACK h, char *addp, int *addrlen)
 {
     int res;
-    mosi_state *st = h->private;
+    mosi_state *st = h->cprivate;
 
     if (!(st->call = (struct t_call*) t_alloc(h->iofile, T_CALL_STR,
    	 T_ALL)))
@@ -395,7 +413,7 @@ COMSTACK mosi_accept(COMSTACK h)
 {
     COMSTACK new;
     void *local;
-    struct mosi_state *st = h->private, *ns;
+    struct mosi_state *st = h->cprivate, *ns;
     int flags = O_RDWR;
 
     if (h->state != CS_INCON)
@@ -406,7 +424,7 @@ COMSTACK mosi_accept(COMSTACK h)
     if (!(new = xmalloc(sizeof(*new))))
     	return 0;
     *new = *h;
-    if (!(new->private = ns = xmalloc(sizeof(*ns))))
+    if (!(new->cprivate = ns = xmalloc(sizeof(*ns))))
     	return 0;
     *ns = *st;
     if (!h->blocking)
@@ -431,7 +449,7 @@ COMSTACK mosi_accept(COMSTACK h)
 int mosi_get(COMSTACK h, char **buf, int *bufsize)
 {
     int flags = 0, res;
-    mosi_state *ct = h->private;
+    mosi_state *ct = h->cprivate;
     int got;
 
     do
@@ -464,7 +482,7 @@ int mosi_get(COMSTACK h, char **buf, int *bufsize)
 
 int mosi_put(COMSTACK h, char *buf, int size)
 {
-    mosi_state *ct = h->private;
+    mosi_state *ct = h->cprivate;
     int res = u_snd(h->iofile, buf + ct->haswrit, size - ct->haswrit, 0);
 
     if (res == size - ct->haswrit)
@@ -484,7 +502,7 @@ int mosi_put(COMSTACK h, char *buf, int size)
 
 int mosi_close(COMSTACK h)
 {
-    xfree(h->private);
+    xfree(h->cprivate);
     if (h->iofile >= 0)
 	u_close(h->iofile);
    xfree(h);
@@ -495,3 +513,5 @@ char *mosi_addrstr(COMSTACK h)
 {
     return "osi:[UNIMPLEMENTED]";
 }
+
+#endif