Move httpserver to network/

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

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)

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"