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/12 13:40:55 UTC
svn commit: r1893277 - in /apr/apr/branches/1.7.x: ./
include/arch/unix/apr_arch_poll_private.h support/unix/waitio.c
Author: ylavic
Date: Sun Sep 12 13:40:54 2021
New Revision: 1893277
URL: http://svn.apache.org/viewvc?rev=1893277&view=rev
Log:
Merge r1893198 from trunk:
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>
Submitted by: ylavic
Modified:
apr/apr/branches/1.7.x/ (props changed)
apr/apr/branches/1.7.x/include/arch/unix/apr_arch_poll_private.h
apr/apr/branches/1.7.x/support/unix/waitio.c
Propchange: apr/apr/branches/1.7.x/
------------------------------------------------------------------------------
Merged /apr/apr/trunk:r1893198
Modified: apr/apr/branches/1.7.x/include/arch/unix/apr_arch_poll_private.h
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.7.x/include/arch/unix/apr_arch_poll_private.h?rev=1893277&r1=1893276&r2=1893277&view=diff
==============================================================================
--- apr/apr/branches/1.7.x/include/arch/unix/apr_arch_poll_private.h (original)
+++ apr/apr/branches/1.7.x/include/arch/unix/apr_arch_poll_private.h Sun Sep 12 13:40:54 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/branches/1.7.x/support/unix/waitio.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.7.x/support/unix/waitio.c?rev=1893277&r1=1893276&r2=1893277&view=diff
==============================================================================
--- apr/apr/branches/1.7.x/support/unix/waitio.c (original)
+++ apr/apr/branches/1.7.x/support/unix/waitio.c Sun Sep 12 13:40:54 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