[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [libmicrohttpd] 04/04: Fixed compiler warnings, updated Cha
From: |
gnunet |
Subject: |
[GNUnet-SVN] [libmicrohttpd] 04/04: Fixed compiler warnings, updated ChangeLog. |
Date: |
Thu, 16 Mar 2017 15:05:23 +0100 |
This is an automated email from the git hooks/post-receive script.
karlson2k pushed a commit to branch master
in repository libmicrohttpd.
commit b3e48b50908ebd754da1fac9cc3b26d567413daa
Author: Evgeny Grin (Karlson2k) <address@hidden>
AuthorDate: Thu Mar 16 17:04:08 2017 +0300
Fixed compiler warnings, updated ChangeLog.
---
ChangeLog | 5 +++++
src/microhttpd/daemon.c | 2 ++
src/microhttpd/test_upgrade.c | 13 +++++++++----
3 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index fa4e0f28..7cca315c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Mar 16 16:49:07 MSK 2017
+ Added ability to get actual daemon flags via MHD_get_daemon_info().
+ Fixed test_upgrade to work in request mode.
+ Fixed compiler warnings in test_upgrade. -EG
+
Wed Mar 15 23:29:59 MSK 2017
Prevented socket read/write if connection is suspended.
Added missing resets of 'connection->in_idle'.
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index ec3f325a..185421c7 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -101,6 +101,7 @@
static void
close_all_connections (struct MHD_Daemon *daemon);
+#ifdef EPOLL_SUPPORT
/**
* Do epoll()-based processing (this function is allowed to
@@ -114,6 +115,7 @@ static int
MHD_epoll (struct MHD_Daemon *daemon,
int may_block);
+#endif /* EPOLL_SUPPORT */
/**
* Default implementation of the panic function,
diff --git a/src/microhttpd/test_upgrade.c b/src/microhttpd/test_upgrade.c
index 06dac795..fe72a70f 100644
--- a/src/microhttpd/test_upgrade.c
+++ b/src/microhttpd/test_upgrade.c
@@ -888,6 +888,7 @@ run_mhd_select_loop (struct MHD_Daemon *daemon)
}
}
+#ifdef HAVE_POLL
/**
* Run the MHD external event loop using select.
@@ -899,8 +900,10 @@ run_mhd_poll_loop (struct MHD_Daemon *daemon)
{
abort (); /* currently not implementable with existing MHD API */
}
+#endif /* HAVE_POLL */
+#ifdef EPOLL_SUPPORT
/**
* Run the MHD external event loop using select.
*
@@ -938,7 +941,7 @@ run_mhd_epoll_loop (struct MHD_Daemon *daemon)
MHD_run (daemon);
}
}
-
+#endif /* EPOLL_SUPPORT */
/**
* Run the MHD external event loop using select.
@@ -949,14 +952,16 @@ static void
run_mhd_loop (struct MHD_Daemon *daemon,
int flags)
{
- if (0 != (flags & MHD_USE_POLL))
+ if (0 == (flags & (MHD_USE_POLL | MHD_USE_EPOLL)))
+ run_mhd_select_loop (daemon);
+#ifdef HAVE_POLL
+ else if (0 != (flags & MHD_USE_POLL))
run_mhd_poll_loop (daemon);
+#endif /* HAVE_POLL */
#if EPOLL_SUPPORT
else if (0 != (flags & MHD_USE_EPOLL))
run_mhd_epoll_loop (daemon);
#endif
- else if (0 == (flags & (MHD_USE_POLL | MHD_USE_EPOLL)))
- run_mhd_select_loop (daemon);
else
abort ();
}
--
To stop receiving notification emails like this one, please contact
address@hidden