projects
/
yaz-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
bc33b8b
)
Porting.
author
Sebastian Hammer
<quinn@indexdata.com>
Fri, 26 Jul 1996 12:34:07 +0000
(12:34 +0000)
committer
Sebastian Hammer
<quinn@indexdata.com>
Fri, 26 Jul 1996 12:34:07 +0000
(12:34 +0000)
comstack/xmosi.c
patch
|
blob
|
history
diff --git
a/comstack/xmosi.c
b/comstack/xmosi.c
index
b769d26
..
ef47253
100644
(file)
--- a/
comstack/xmosi.c
+++ b/
comstack/xmosi.c
@@
-4,7
+4,10
@@
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: xmosi.c,v $
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: xmosi.c,v $
- * Revision 1.13 1996-07-06 19:58:30 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
* System headerfiles gathered in yconfig
*
* Revision 1.12 1996/05/22 08:34:44 adam
@@
-105,8
+108,16
@@
#include <string.h>
#include <assert.h>
#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>
#define YNETINCLUDE
#include <yconfig.h>
+>>>>>>> /tmp/T4a00144
#include <comstack.h>
#include <xmosi.h>
#include <comstack.h>
#include <xmosi.h>