[GNUnet-SVN] [libmicrohttpd] branch master updated (e5892137 -> 5b3cd84e)

[gnunet]

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

karlson2k pushed a change to branch master
in repository libmicrohttpd.

    from e5892137 resume_suspended_connections(): fixed assert at daemon 
shutdown.
     new adf9e8ce test_options: muted compiler warning.
     new 5b3cd84e test_options: really use this test instead of just compiling, 
moved to src/microhttpd as it does not depend on libcurl

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:
 src/microhttpd/Makefile.am                  |  8 +++++++-
 src/{testcurl => microhttpd}/test_options.c | 10 ++++++++++
 src/testcurl/Makefile.am                    |  8 --------
 3 files changed, 17 insertions(+), 9 deletions(-)
 rename src/{testcurl => microhttpd}/test_options.c (93%)

diff --git a/src/microhttpd/Makefile.am b/src/microhttpd/Makefile.am
index 48a72b43..952148be 100644
--- a/src/microhttpd/Makefile.am
+++ b/src/microhttpd/Makefile.am
@@ -144,7 +144,8 @@ check_PROGRAMS = \
   test_str_to_value \
   test_str_token \
   test_http_reasons \
-  test_daemon
+  test_daemon \
+  test_options
 
 if HAVE_POSIX_THREADS
 if ENABLE_UPGRADE
@@ -278,3 +279,8 @@ test_str_token_SOURCES = \
 test_http_reasons_SOURCES = \
   test_http_reasons.c \
   reason_phrase.c mhd_str.c mhd_str.h
+
+test_options_SOURCES = \
+  test_options.c
+test_options_LDADD = \
+  $(top_builddir)/src/microhttpd/libmicrohttpd.la
diff --git a/src/testcurl/test_options.c b/src/microhttpd/test_options.c
similarity index 93%
rename from src/testcurl/test_options.c
rename to src/microhttpd/test_options.c
index 004fe615..3198c731 100644
--- a/src/testcurl/test_options.c
+++ b/src/microhttpd/test_options.c
@@ -44,6 +44,15 @@ ahc_echo (void *cls,
           const char *upload_data, size_t *upload_data_size,
           void **unused)
 {
+  (void)cls;
+  (void)connection;
+  (void)url;
+  (void)method;
+  (void)version;
+  (void)upload_data;
+  (void)upload_data_size;
+  (void)unused;
+
   return 0;
 }
 
@@ -118,6 +127,7 @@ int
 main (int argc, char *const *argv)
 {
   unsigned int errorCount = 0;
+  (void)argc; (void)argv; /* Unused. Silent compiler warning. */
 
   errorCount += test_wrap_loc ("ip addr option", &test_ip_addr_option);
 
diff --git a/src/testcurl/Makefile.am b/src/testcurl/Makefile.am
index 7d315d5b..10fae873 100644
--- a/src/testcurl/Makefile.am
+++ b/src/testcurl/Makefile.am
@@ -70,9 +70,6 @@ if HAVE_POSTPROCESSOR
   test_post_loop11
 endif
 
-noinst_PROGRAMS = \
-  test_options
-
 if ENABLE_DAUTH
   check_PROGRAMS += \
        test_digestauth test_digestauth_with_arguments
@@ -99,11 +96,6 @@ test_concurrent_stop_LDADD = \
   $(top_builddir)/src/microhttpd/libmicrohttpd.la \
   $(PTHREAD_LIBS) @LIBCURL@
 
-test_options_SOURCES = \
-  test_options.c
-test_options_LDADD = \
-  $(top_builddir)/src/microhttpd/libmicrohttpd.la
-
 test_get_SOURCES = \
   test_get.c
 test_get_LDADD = \

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