1 files changed, 2 insertions, 3 deletions

diff --git a/include/poll.h b/include/poll.h
index 54fc4ab..cbc78fd 100644
--- a/include/poll.h
+++ b/include/poll.h
@@ -1,7 +1,6 @@
 #ifndef FORTIFY_POLL_H_
 #define FORTIFY_POLL_H_
 
-#include_next <stddef.h>
 #include_next <poll.h>
 
 #if defined(_FORTIFY_SOURCE) && _FORTIFY_SOURCE > 0 && defined(__OPTIMIZE__) && __OPTIMIZE__ > 0
@@ -10,9 +9,9 @@ static inline __attribute__ ((always_inline))
 int
 __fortify_poll(struct pollfd *fds, nfds_t nfds, int timeout)
 {
-        size_t bos = __builtin_object_size(fds, 0);
 
-        if (bos != -1 && nfds > bos / sizeof(struct pollfd))
+        if (__builtin_object_size(fds, 0) != -1 &&
+            nfds > __builtin_object_size(fds, 0) / sizeof(struct pollfd))
                 __builtin_trap();
         return poll(fds, nfds, timeout);
 }