[GNUnet-SVN] [libmicrohttpd] branch master updated (830433dd -> ab406a9e)

[gnunet]

This is an automated email from the git hooks/post-receive script.

karlson2k pushed a change to branch master
in repository libmicrohttpd.

    from 830433dd Updated M4 autoconf-archive macros to latest versions
     new 4a4e93fb Fixed compatibility with platforms without poll()
     new ab406a9e configure: better test for "-Werror=attributes"

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 configure.ac            | 16 +++++++++++++++-
 src/microhttpd/daemon.c |  2 ++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index b00e7885..fabcde9f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -182,7 +182,21 @@ AS_VAR_IF([[mhd_cv_macro_true_false_valid]], [["yes"]], 
[[:]],
 
 
 AX_CHECK_COMPILE_FLAG([[-Werror=attributes]],
-                      [[errattr_CFLAGS="-Werror=attributes"]],
+  [
+   save_CFLAGS="$CFLAGS"
+   CFLAGS="$CFLAGS -Werror=attributes"
+   AC_MSG_CHECKING([[whether -Werror=attributes actually works]])
+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+       [[__attribute__((non_existing_attrb_dummy)) int SimpleFunc(void) 
{return 3;}]], [[int r = SimpleFunc(); if (r) return r;]])],
+     [
+       AC_MSG_RESULT([[no]])
+       errattr_CFLAGS=""
+     ], [
+       AC_MSG_RESULT([[yes]])
+       errattr_CFLAGS="-Werror=attributes"
+     ])
+   CFLAGS="$save_CFLAGS"
+  ],
                       [[errattr_CFLAGS=""]], [], [])
 AC_MSG_CHECKING([[for function inline keywords suppoted by $CC]])
 save_CFLAGS="$CFLAGS"
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index b92d5534..49a1b828 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -814,6 +814,7 @@ urh_from_fdset (struct MHD_UpgradeResponseHandle *urh,
     }
 }
 
+#ifdef HAVE_POLL
 
 /**
  * Set required 'event' members in 'pollfd' elements,
@@ -904,6 +905,7 @@ urh_from_pollfd(struct MHD_UpgradeResponseHandle *urh,
   if (0 != (p[1].revents & MHD_POLL_REVENTS_ERRROR))
     urh->mhd.celi |= MHD_EPOLL_STATE_READ_READY | MHD_EPOLL_STATE_WRITE_READY;
 }
+#endif /* HAVE_POLL */
 #endif /* HTTPS_SUPPORT && UPGRADE_SUPPORT */
 
 

-- 
To stop receiving notification emails like this one, please contact
address@hidden