From 6fb76c3cd9392199a7c19c9175f85e900459ffa3 Mon Sep 17 00:00:00 2001
From: leitner <leitner>
Date: Tue, 2 Mar 2004 22:41:34 +0000
Subject: [PATCH] <io.h> -> <iob.h>

---
 io/io_waituntil2.c     | 4 ++++
 io/iob_addbuf.3        | 2 +-
 io/iob_addbuf_free.3   | 2 +-
 io/iob_addfile.3       | 2 +-
 io/iob_addfile_close.3 | 2 +-
 io/iob_adds.3          | 2 +-
 io/iob_adds_free.3     | 2 +-
 io/iob_new.3           | 2 +-
 io/iob_prefetch.3      | 2 +-
 io/iob_send.3          | 2 +-
 10 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/io/io_waituntil2.c b/io/io_waituntil2.c
index bfc4da9..f1c3ff1 100644
--- a/io/io_waituntil2.c
+++ b/io/io_waituntil2.c
@@ -40,7 +40,11 @@ int64 io_waituntil2(int64 milliseconds) {
 	  if (e->wantread) y[i].events|=EPOLLIN;
 	  if (e->wantwrite) y[i].events|=EPOLLOUT;
 	}
+#ifdef EPOLLRDNORM
 	if (!e->canread && (y[i].events&(EPOLLIN|EPOLLPRI|EPOLLRDNORM|EPOLLRDBAND))) {
+#else
+	if (!e->canread && (y[i].events&(EPOLLIN|EPOLLPRI))) {
+#endif
 	  e->canread=1;
 	  e->next_read=first_readable;
 	  first_readable=y[i].data.fd;
diff --git a/io/iob_addbuf.3 b/io/iob_addbuf.3
index f3f2e85..c1475ee 100644
--- a/io/iob_addbuf.3
+++ b/io/iob_addbuf.3
@@ -2,7 +2,7 @@
 .SH NAME
 iob_addbuf \- add buffer to I/O batch
 .SH SYNTAX
-.B #include <io.h>
+.B #include <iob.h>
 
 void \fBiob_addbuf\fP(io_batch* b,const void* buf,uint64 n);
 .SH DESCRIPTION
diff --git a/io/iob_addbuf_free.3 b/io/iob_addbuf_free.3
index 4227db4..ce32791 100644
--- a/io/iob_addbuf_free.3
+++ b/io/iob_addbuf_free.3
@@ -2,7 +2,7 @@
 .SH NAME
 iob_addbuf_free \- add buffer to I/O batch, with deallocation
 .SH SYNTAX
-.B #include <io.h>
+.B #include <iob.h>
 
 void \fBiob_addbuf_free\fP(io_batch* b,const void* buf,uint64 n);
 .SH DESCRIPTION
diff --git a/io/iob_addfile.3 b/io/iob_addfile.3
index 4803f10..4622a88 100644
--- a/io/iob_addfile.3
+++ b/io/iob_addfile.3
@@ -2,7 +2,7 @@
 .SH NAME
 iob_addfile \- add file region to I/O batch
 .SH SYNTAX
-.B #include <io.h>
+.B #include <iob.h>
 
 void \fBiob_addfile\fP(io_batch* b,int64 fd,uint64 off,uint64 n);
 .SH DESCRIPTION
diff --git a/io/iob_addfile_close.3 b/io/iob_addfile_close.3
index ac38a9e..c31333c 100644
--- a/io/iob_addfile_close.3
+++ b/io/iob_addfile_close.3
@@ -2,7 +2,7 @@
 .SH NAME
 iob_addfile_close \- add file region to I/O batch
 .SH SYNTAX
-.B #include <io.h>
+.B #include <iob.h>
 
 void \fBiob_addfile_close\fP(io_batch* b,int64 fd,uint64 off,uint64 n);
 .SH DESCRIPTION
diff --git a/io/iob_adds.3 b/io/iob_adds.3
index 7b3d162..dd98a7d 100644
--- a/io/iob_adds.3
+++ b/io/iob_adds.3
@@ -2,7 +2,7 @@
 .SH NAME
 iob_adds \- add buffer to I/O batch
 .SH SYNTAX
-.B #include <io.h>
+.B #include <iob.h>
 
 void \fBiob_adds\fP(io_batch* b,const char* s);
 .SH DESCRIPTION
diff --git a/io/iob_adds_free.3 b/io/iob_adds_free.3
index 6410b28..53d6a37 100644
--- a/io/iob_adds_free.3
+++ b/io/iob_adds_free.3
@@ -2,7 +2,7 @@
 .SH NAME
 iob_adds_free \- add buffer to I/O batch
 .SH SYNTAX
-.B #include <io.h>
+.B #include <iob.h>
 
 void \fBiob_adds_free\fP(io_batch* b,const char* s);
 .SH DESCRIPTION
diff --git a/io/iob_new.3 b/io/iob_new.3
index 7b41414..8c7067a 100644
--- a/io/iob_new.3
+++ b/io/iob_new.3
@@ -2,7 +2,7 @@
 .SH NAME
 iob_new \- create new I/O batch
 .SH SYNTAX
-.B #include <io.h>
+.B #include <iob.h>
 
 io_batch* \fBiob_new\fP(int hint_entries);
 .SH DESCRIPTION
diff --git a/io/iob_prefetch.3 b/io/iob_prefetch.3
index a0bb10c..21c94e7 100644
--- a/io/iob_prefetch.3
+++ b/io/iob_prefetch.3
@@ -2,7 +2,7 @@
 .SH NAME
 iob_prefetch \- prefetch data for I/O batch
 .SH SYNTAX
-.B #include <io.h>
+.B #include <iob.h>
 
 void \fBiob_prefetch\fP(io_batch* b,uint64 n);
 .SH DESCRIPTION
diff --git a/io/iob_send.3 b/io/iob_send.3
index 3fb13c0..95f3136 100644
--- a/io/iob_send.3
+++ b/io/iob_send.3
@@ -2,7 +2,7 @@
 .SH NAME
 iob_send \- send I/O batch
 .SH SYNTAX
-.B #include <io.h>
+.B #include <iob.h>
 
 int64 \fBiob_send\fP(int64 s,io_batch* b);
 .SH DESCRIPTION