From 6f23a8ac0d8deed7ed570a42d17b1818489cd309 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 12 Sep 2016 17:21:00 +0200
Subject: [PATCH] Move httpserver to network/

---
 griffin/griffin.c                                |  2 +-
 .../httpserver}/handle_form.inl                  |  0
 {httpserver => network/httpserver}/httpserver.c  | 16 ++++++++--------
 {httpserver => network/httpserver}/httpserver.h  |  0
 runloop.c                                        |  2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)
 rename {httpserver => network/httpserver}/handle_form.inl (100%)
 rename {httpserver => network/httpserver}/httpserver.c (98%)
 rename {httpserver => network/httpserver}/httpserver.h (100%)

diff --git a/griffin/griffin.c b/griffin/griffin.c
index e38f6657b0..871467abfd 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -1046,7 +1046,7 @@ HTTP SERVER
 ============================================================ */
 #if defined(HAVE_HTTPSERVER) && defined(HAVE_ZLIB)
 #include "../deps/civetweb/civetweb.c"
-#include "httpserver/httpserver.c"
+#include "network/httpserver/httpserver.c"
 #endif
 
 #ifdef __cplusplus
diff --git a/httpserver/handle_form.inl b/network/httpserver/handle_form.inl
similarity index 100%
rename from httpserver/handle_form.inl
rename to network/httpserver/handle_form.inl
diff --git a/httpserver/httpserver.c b/network/httpserver/httpserver.c
similarity index 98%
rename from httpserver/httpserver.c
rename to network/httpserver/httpserver.c
index 5e0c44e55a..e90909d52d 100644
--- a/httpserver/httpserver.c
+++ b/network/httpserver/httpserver.c
@@ -9,19 +9,19 @@
 #include <string/stdstring.h>
 #include <compat/zlib.h>
 
-#include "../core.h"
-#include "../runloop.h"
-#include "../core.h"
-#include "../gfx/video_driver.h"
-#include "../managers/core_option_manager.h"
-#include "../cheevos.h"
-#include "../content.h"
+#include "../../core.h"
+#include "../../runloop.h"
+#include "../../core.h"
+#include "../../gfx/video_driver.h"
+#include "../../managers/core_option_manager.h"
+#include "../../cheevos.h"
+#include "../../content.h"
 
 #define BASIC_INFO "info"
 #define MEMORY_MAP "memoryMap"
 
 static struct mg_callbacks s_httpserver_callbacks;
-static struct mg_context* s_httpserver_ctx;
+static struct mg_context   *s_httpserver_ctx       = NULL;
 
 /* Based on https://github.com/zeromq/rfc/blob/master/src/spec_32.c */
 static void httpserver_z85_encode_inplace(Bytef* data, size_t size)
diff --git a/httpserver/httpserver.h b/network/httpserver/httpserver.h
similarity index 100%
rename from httpserver/httpserver.h
rename to network/httpserver/httpserver.h
diff --git a/runloop.c b/runloop.c
index 71b5e84798..fb8a86897a 100644
--- a/runloop.c
+++ b/runloop.c
@@ -52,7 +52,7 @@
 #endif
 
 #if defined(HAVE_HTTPSERVER) && defined(HAVE_ZLIB)
-#include "httpserver/httpserver.h"
+#include "network/httpserver/httpserver.h"
 #endif
 
 #include "autosave.h"