Merge branch 'main' into main

1 files changed, 5 insertions, 8 deletions

diff --git a/libc-bottom-half/cloudlibc/src/libc/poll/poll.c b/libc-bottom-half/cloudlibc/src/libc/poll/poll.c
index 3b4cd80..3ceb432 100644
--- a/libc-bottom-half/cloudlibc/src/libc/poll/poll.c
+++ b/libc-bottom-half/cloudlibc/src/libc/poll/poll.c
@@ -47,18 +47,15 @@ int poll(struct pollfd *fds, size_t nfds, int timeout) {
 
   // Create extra event for the timeout.
   if (timeout >= 0) {
-    if (timeout == 0) {
-      // in WASI, a timeout of 0 corresponds to an indefinite wait, so to work
-      // around that and remain compatible with downstream libc users here we
-      // set the subscription timeout to 1 (which actually corresponds to
-      // immediate wakeup)
-      timeout = 1;
-    }
+    // in WASI, a timeout of 0 corresponds to an indefinite wait, so to work
+    // around that and remain compatible with downstream libc users here we
+    // set the subscription timeout to 1 (which actually corresponds to
+    // immediate wakeup)
     __wasi_subscription_t *subscription = &subscriptions[nsubscriptions++];
     *subscription = (__wasi_subscription_t){
         .u.tag = __WASI_EVENTTYPE_CLOCK,
         .u.u.clock.id = __WASI_CLOCKID_REALTIME,
-        .u.u.clock.timeout = (__wasi_timestamp_t)timeout * 1000000,
+        .u.u.clock.timeout = (__wasi_timestamp_t)(timeout?(timeout * 1000000LL):1LL),
     };
   }