Move net_compat/net_http to libretro-common

Makefile.common

@@ -654,8 +654,8 @@ endif
 
 ifeq ($(HAVE_NETWORKING), 1)
    DEFINES += -DHAVE_NETWORKING
-   OBJ += net_compat.o \
-			 net_http.o
+   OBJ += libretro-common/net/net_compat.o \
+			 libretro-common/net/net_http.o
 
    ifneq ($(findstring Win32,$(OS)),)
       LIBS += -lws2_32

command.c

@@ -16,7 +16,7 @@
 
 #include "command.h"
 
-#include "net_compat.h"
+#include <net/net_compat.h>
 #if defined(HAVE_NETWORK_CMD) && defined(HAVE_NETPLAY)
 #include "netplay.h"
 #endif

griffin/griffin.c

@@ -655,8 +655,8 @@ NETPLAY
 ============================================================ */
 #ifdef HAVE_NETPLAY
 #include "../netplay.c"
-#include "../net_compat.c"
-#include "../net_http.c"
+#include "../libretro-common/net/net_compat.c"
+#include "../libretro-common/net/net_http.c"
 #endif
 
 /*============================================================

libretro-common/net/net_compat.c

@@ -14,9 +14,8 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "net_compat.h"
+#include <net/net_compat.h>
 #include "netplay.h"
-#include "general.h"
 #include <stdlib.h>
 #include <string.h>
 

libretro-common/net/net_http.c

@@ -14,11 +14,11 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "net_http.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <ctype.h>
-#include "net_compat.h"
+#include <net/net_http.h>
+#include <net/net_compat.h>
 #include <compat/strl.h>
 
 enum

menu/menu_entries_cbs.c

@@ -27,10 +27,6 @@
 #include "../retroarch.h"
 #include "../runloop.h"
 
-#ifdef HAVE_NETWORKING
-#include "../net_http.h"
-#endif
-
 void menu_entries_common_load_content(bool persist)
 {
    menu_handle_t *menu = menu_driver_resolve();

menu/menu_entries_cbs_deferred_push.c

@@ -23,10 +23,6 @@
 #include "../retroarch.h"
 #include "../performance.h"
 
-#ifdef HAVE_NETWORKING
-#include "../net_http.h"
-#endif
-
 #ifdef HAVE_LIBRETRODB
 #include "../database_info.h"
 #endif

menu/menu_entries_cbs_ok.c

@@ -24,10 +24,6 @@
 #include "../retroarch.h"
 #include "../runloop.h"
 
-#ifdef HAVE_NETWORKING
-#include "../net_http.h"
-#endif
-
 #include "../input/input_remapping.h"
 
 /* FIXME - Global variables, refactor */

netplay.c

@@ -18,15 +18,15 @@
 #pragma comment(lib, "ws2_32")
 #endif
 
-#include "net_compat.h"
+#include <stdlib.h>
+#include <string.h>
+#include <net/net_compat.h>
+#include <queues/message_queue.h>
 #include "netplay.h"
 #include "general.h"
 #include "runloop.h"
 #include "autosave.h"
 #include "dynamic.h"
-#include <queues/message_queue.h>
-#include <stdlib.h>
-#include <string.h>
 
 struct delta_frame
 {

retroarch.c

@@ -53,8 +53,7 @@
 #endif
 
 #ifdef HAVE_NETWORKING
-#include "net_compat.h"
-#include "net_http.h"
+#include <net/net_compat.h>
 #endif
 
 #ifdef HAVE_NETPLAY

runloop_data.c

@@ -25,7 +25,7 @@
 typedef int (*transfer_cb_t               )(void *data, size_t len);
 
 #ifdef HAVE_NETWORKING
-#include "net_http.h"
+#include <net/net_http.h>
 
 typedef struct http_handle
 {