New ODR function, odr_choice_enable_bias, to control behaviour of

[yaz-moved-to-github.git] / comstack / xmosi.c

diff --git a/comstack/xmosi.c b/comstack/xmosi.c
index 43797cf..ef47253 100644 (file)
--- a/comstack/xmosi.c
+++ b/comstack/xmosi.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: xmosi.c,v $
- * Revision 1.11  1996-02-23 10:00:41  quinn
+ * 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 +98,7 @@
  *
  */
 
+#ifdef USE_XTIMOSI
 /*
  * Glue layer for Peter Furniss' xtimosi package.
  */
@@ -98,11 +108,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>
@@ -495,3 +510,5 @@ char *mosi_addrstr(COMSTACK h)
 {
     return "osi:[UNIMPLEMENTED]";
 }
+
+#endif