milkway: take a fd argument instead of mw_pollfd_t in mw-poll::remove_fd

5 files changed, 10 insertions, 10 deletions

diff --git a/milkway/mw-poll-select.c b/milkway/mw-poll-select.c
index 6e26f6d..c93efaf 100644
--- a/milkway/mw-poll-select.c
+++ b/milkway/mw-poll-select.c
@@ -73,8 +73,8 @@ mw_poll_select_new(void)
 
 static mw_bool_t
 mw_poll_select_add_fd(mw_poll_t *super,
-		   mw_pollfd_t *fd,
-		   mw_error_t **reterr)
+		      mw_pollfd_t *fd,
+		      mw_error_t **reterr)
 {
     mw_poll_select_t *self = (mw_poll_select_t*)super;
 
@@ -83,8 +83,8 @@ mw_poll_select_add_fd(mw_poll_t *super,
 
 static mw_bool_t
 mw_poll_select_remove_fd(mw_poll_t *super,
-		      mw_pollfd_t *fd,
-		      mw_error_t **reterr)
+			 mw_uintptr_t fd,
+			 mw_error_t **reterr)
 {
     mw_poll_select_t *self = (mw_poll_select_t*)super;
 
diff --git a/milkway/mw-poll-sys.c b/milkway/mw-poll-sys.c
index 83c168b..e2078b2 100644
--- a/milkway/mw-poll-sys.c
+++ b/milkway/mw-poll-sys.c
@@ -79,7 +79,7 @@ mw_poll_sys_add_fd(mw_poll_t *super,
 
 static mw_bool_t
 mw_poll_sys_remove_fd(mw_poll_t *super,
-		      mw_pollfd_t *fd,
+		      mw_uintptr_t fd,
 		      mw_error_t **reterr)
 {
     mw_poll_sys_t *self = (mw_poll_sys_t*)super;
diff --git a/milkway/mw-poll-win32.c b/milkway/mw-poll-win32.c
index f35c92d..579b790 100644
--- a/milkway/mw-poll-win32.c
+++ b/milkway/mw-poll-win32.c
@@ -58,7 +58,7 @@ mw_poll_win32_add_fd(mw_poll_t *super,
 
 static mw_bool_t
 mw_poll_win32_remove_fd(mw_poll_t *super,
-			mw_pollfd_t *fd,
+			mw_uintptr_t fd,
 			mw_error_t **reterr)
 {
     mw_poll_win32_t *self = (mw_poll_win32_t*)super;
diff --git a/milkway/mw-poll.c b/milkway/mw-poll.c
index 80bb198..cdcad03 100644
--- a/milkway/mw-poll.c
+++ b/milkway/mw-poll.c
@@ -52,12 +52,12 @@ mw_poll_default_add_fd(mw_poll_t *super,
 
 static mw_bool_t
 mw_poll_default_remove_fd(mw_poll_t *super,
-			  mw_pollfd_t *fd,
+			  mw_uintptr_t fd,
 			  mw_error_t **reterr)
 {
     mw_poll_t *self = (mw_poll_t*)super;
 
-    if (!mw_hash_remove(self->fds, (mw_pointer_t)fd->fd)) {
+    if (!mw_hash_remove(self->fds, (mw_pointer_t)fd)) {
 	mw_error_set(reterr, "poll", MW_OUT_OF_MEM,
 		     "failed to remove the fd");
 	return MW_FALSE;
diff --git a/milkway/mw-poll.h b/milkway/mw-poll.h
index 92caf41..1ff8753 100644
--- a/milkway/mw-poll.h
+++ b/milkway/mw-poll.h
@@ -40,7 +40,7 @@ struct mw_poll_type {
 
     mw_bool_t
     (*remove_fd) (mw_poll_t *self,
-		  mw_pollfd_t *fd,
+		  mw_uintptr_t fd,
 		  mw_error_t **reterr);
 
     mw_bool_t
@@ -90,7 +90,7 @@ mw_poll_add_fd(mw_poll_t *self,
 
 static mw_inline mw_bool_t
 mw_poll_remove_fd(mw_poll_t *self,
-		  mw_pollfd_t *fd,
+		  mw_uintptr_t fd,
 		  mw_error_t **reterr)
 {
     mw_poll_type_t *type = (mw_poll_type_t *)MW_TYPE(self);