From 93a3048ea50fa6cfe3c25cd167baf49f3142d8ba Mon Sep 17 00:00:00 2001
From: Lammert Bies <github@linocomm.net>
Date: Sun, 11 Dec 2016 14:27:23 +0100
Subject: [PATCH] Moved mg_get_valid_options to own file

---
 Makefile                        |  1 +
 src/httplib_get_valid_options.c | 34 +++++++++++++++++++++++++++++++++
 src/libhttp.c                   | 26 ++++++++-----------------
 3 files changed, 43 insertions(+), 18 deletions(-)
 create mode 100644 src/httplib_get_valid_options.c

diff --git a/Makefile b/Makefile
index 00a33102..8c0f402c 100644
--- a/Makefile
+++ b/Makefile
@@ -81,6 +81,7 @@ LIB_SOURCES =	src/libhttp.c						\
 		src/httplib_get_response_code_text.c			\
 		src/httplib_get_system_name.c				\
 		src/httplib_get_uri_type.c				\
+		src/httplib_get_valid_options.c				\
 		src/httplib_get_var.c					\
 		src/httplib_getreq.c					\
 		src/httplib_handle_cgi_request.c			\
diff --git a/src/httplib_get_valid_options.c b/src/httplib_get_valid_options.c
new file mode 100644
index 00000000..ccb5e558
--- /dev/null
+++ b/src/httplib_get_valid_options.c
@@ -0,0 +1,34 @@
+/* 
+ * Copyright (c) 2016 Lammert Bies
+ * Copyright (c) 2013-2016 the Civetweb developers
+ * Copyright (c) 2004-2013 Sergey Lyubka
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+
+
+#include "libhttp-private.h"
+
+
+const struct mg_option *mg_get_valid_options(void) {
+
+	return XX_httplib_config_options;
+
+}  /* mg_get_valid_options */
diff --git a/src/libhttp.c b/src/libhttp.c
index c957498f..9c238362 100644
--- a/src/libhttp.c
+++ b/src/libhttp.c
@@ -827,13 +827,6 @@ void XX_httplib_set_thread_name(const char *threadName) {
 #endif
 
 
-const struct mg_option * mg_get_valid_options(void) {
-
-	return XX_httplib_config_options;
-
-}  /* mg_get_valid_options */
-
-
 int XX_httplib_is_file_in_memory( const struct mg_connection *conn, const char *path, struct file *filep ) {
 
 	size_t size = 0;
@@ -1827,33 +1820,30 @@ static int pthread_cond_destroy(pthread_cond_t *cv) {
 static void * event_create(void) {
 
 	return (void *)CreateEvent(NULL, FALSE, FALSE, NULL);
-}
+
+}  /* event_create */
 
 
 static int event_wait(void *eventhdl) {
 
 	int res = WaitForSingleObject((HANDLE)eventhdl, INFINITE);
 	return (res == WAIT_OBJECT_0);
-}
+
+}  /* event_wait */
 
 
 static int event_signal(void *eventhdl) {
 
 	return (int)SetEvent((HANDLE)eventhdl);
-}
+
+}a  /* event_signal */
 
 
 static void event_destroy(void *eventhdl) {
 
 	CloseHandle((HANDLE)eventhdl);
-}
+
+}  /* event_destroy */
 #endif
 
-
-#if defined(__MINGW32__)
-/* Enable unused function warning again */
-#pragma GCC diagnostic pop
-#endif
-
-
 #endif /* _WIN32 */