You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by yl...@apache.org on 2021/09/09 23:28:47 UTC
svn commit: r1893198 - in /apr/apr/trunk:
include/arch/unix/apr_arch_poll_private.h support/unix/waitio.c
Author: ylavic
Date: Thu Sep 9 23:28:46 2021
New Revision: 1893198
URL: http://svn.apache.org/viewvc?rev=1893198&view=rev
Log:
poll: don't #include sys/poll.h if poll.h is available.
With musl libc, this fixes:
#warning redirecting incorrect #include <sys/poll.h> to <poll.h>
Modified:
apr/apr/trunk/include/arch/unix/apr_arch_poll_private.h
apr/apr/trunk/support/unix/waitio.c
Modified: apr/apr/trunk/include/arch/unix/apr_arch_poll_private.h
URL: http://svn.apache.org/viewvc/apr/apr/trunk/include/arch/unix/apr_arch_poll_private.h?rev=1893198&r1=1893197&r2=1893198&view=diff
==============================================================================
--- apr/apr/trunk/include/arch/unix/apr_arch_poll_private.h (original)
+++ apr/apr/trunk/include/arch/unix/apr_arch_poll_private.h Thu Sep 9 23:28:46 2021
@@ -19,9 +19,7 @@
#if HAVE_POLL_H
#include <poll.h>
-#endif
-
-#if HAVE_SYS_POLL_H
+#elif HAVE_SYS_POLL_H
#include <sys/poll.h>
#endif
Modified: apr/apr/trunk/support/unix/waitio.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/support/unix/waitio.c?rev=1893198&r1=1893197&r2=1893198&view=diff
==============================================================================
--- apr/apr/trunk/support/unix/waitio.c (original)
+++ apr/apr/trunk/support/unix/waitio.c Thu Sep 9 23:28:46 2021
@@ -30,10 +30,9 @@
#ifdef WAITIO_USES_POLL
-#ifdef HAVE_POLL_H
+#if HAVE_POLL_H
#include <poll.h>
-#endif
-#ifdef HAVE_SYS_POLL_H
+#elif HAVE_SYS_POLL_H
#include <sys/poll.h>
#endif