poll: fix compilation issues

Author: bukka

main/poll/poll_backend_poll.c

@@ -14,10 +14,6 @@
 
 #include "php_poll_internal.h"
 
-#include <poll.h>
-#include <stdlib.h>
-#include <string.h>
-
 typedef struct {
 	php_poll_fd_table *fd_table;
 	struct pollfd *temp_fds;

main/poll/poll_core.c

@@ -351,11 +351,11 @@ php_poll_error php_poll_errno_to_error(int err)
 #ifdef ENOSYS
 		case ENOSYS:
 #endif
-#ifdef EOPNOTSUPP
-		case EOPNOTSUPP:
-#endif
-#ifdef ENOTSUP
+#if ENOTSUP
 		case ENOTSUP:
+#endif
+#if defined(EOPNOTSUPP) && EOPNOTSUPP != ENOTSUP
+		case EOPNOTSUPP:
 #endif
 			return PHP_POLL_ERR_NOSUPPORT;
 

main/poll/poll_fd_table.c

@@ -34,10 +34,9 @@ php_poll_fd_table *php_poll_fd_table_init(int initial_capacity, bool persistent)
 void php_poll_fd_table_cleanup(php_poll_fd_table *table)
 {
 	if (table) {
-		zend_ulong fd;
 		zval *zv;
 
-		ZEND_HASH_FOREACH_NUM_KEY_VAL(&table->entries_ht, fd, zv)
+		ZEND_HASH_FOREACH_VAL(&table->entries_ht, zv)
 		{
 			php_poll_fd_entry *entry = Z_PTR_P(zv);
 			pefree(entry, table->persistent);