Remove netplay_discovery.h - hopefully fixes other build issues

menu/cbs/menu_cbs_info.c

@@ -23,7 +23,7 @@
 #include "../../audio/audio_driver.h"
 
 #ifdef HAVE_NETWORKING
-#include "../../network/netplay/netplay_discovery.h"
+#include "../../network/netplay/netplay.h"
 #endif
 
 #ifndef BIND_ACTION_INFO

menu/cbs/menu_cbs_select.c

@@ -27,7 +27,6 @@
 
 #ifdef HAVE_NETWORKING
 #include "../../network/netplay/netplay.h"
-#include "../../network/netplay/netplay_discovery.h"
 #endif
 
 #ifndef BIND_ACTION_SELECT

menu/cbs/menu_cbs_sublabel.c

@@ -37,7 +37,6 @@
 
 #ifdef HAVE_NETWORKING
 #include "../../network/netplay/netplay.h"
-#include "../../network/netplay/netplay_discovery.h"
 #endif
 
 #include "../../retroarch.h"

menu/menu_displaylist.c

@@ -47,7 +47,6 @@
 #ifdef HAVE_NETWORKING
 #include <net/net_http_parse.h>
 #include "../../network/netplay/netplay.h"
-#include "../network/netplay/netplay_discovery.h"
 #include "../core_updater_list.h"
 #endif
 

network/discord.c

@@ -27,7 +27,6 @@
 
 #ifdef HAVE_NETWORKING
 #include "netplay/netplay.h"
-#include "netplay/netplay_discovery.h"
 #endif
 
 #include "../paths.h"

network/netplay/netplay.h

@@ -28,9 +28,9 @@
 #include "../../config.h"
 #endif
 
-#ifdef HAVE_NETPLAYDISCOVERY
-#include "netplay_discovery.h"
-#endif
+#include <net/net_compat.h>
+#include <net/net_ifinfo.h>
+#include <retro_miscellaneous.h>
 
 #include "../../core.h"
 
@@ -82,6 +82,22 @@ enum rarch_netplay_share_analog_preference
    RARCH_NETPLAY_SHARE_ANALOG_LAST
 };
 
+enum netplay_host_method
+{
+   NETPLAY_HOST_METHOD_UNKNOWN = 0,
+   NETPLAY_HOST_METHOD_MANUAL,
+   NETPLAY_HOST_METHOD_UPNP,
+   NETPLAY_HOST_METHOD_MITM
+};
+
+enum rarch_netplay_discovery_ctl_state
+{
+    RARCH_NETPLAY_DISCOVERY_CTL_NONE = 0,
+    RARCH_NETPLAY_DISCOVERY_CTL_LAN_SEND_QUERY,
+    RARCH_NETPLAY_DISCOVERY_CTL_LAN_GET_RESPONSES,
+    RARCH_NETPLAY_DISCOVERY_CTL_LAN_CLEAR_RESPONSES
+};
+
 typedef struct netplay netplay_t;
 
 #ifdef HAVE_NETPLAYDISCOVERY
@@ -162,7 +178,6 @@ struct netplay_host_list
    size_t size;
 };
 
-
 typedef struct
 {
    netplay_t *data; /* Used while Netplay is running */
@@ -320,4 +335,16 @@ size_t audio_sample_batch_net(const int16_t *data, size_t frames);
 int16_t input_state_net(unsigned port, unsigned device,
       unsigned idx, unsigned id);
 
+#ifdef HAVE_NETPLAYDISCOVERY
+/** Initialize Netplay discovery */
+bool init_netplay_discovery(void);
+
+/** Deinitialize and free Netplay discovery */
+void deinit_netplay_discovery(void);
+
+/** Discovery control */
+bool netplay_discovery_driver_ctl(
+      enum rarch_netplay_discovery_ctl_state state, void *data);
+#endif
+
 #endif

network/netplay/netplay_discovery.h

@@ -1,51 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2016-2017 - Gregor Richards
- *
- *  RetroArch is free software: you can redistribute it and/or modify it under the terms
- *  of the GNU General Public License as published by the Free Software Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
- *
- *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *  PURPOSE.  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __RARCH_NETPLAY_DISCOVERY_H
-#define __RARCH_NETPLAY_DISCOVERY_H
-
-#include <net/net_compat.h>
-#include <net/net_ifinfo.h>
-#include <retro_miscellaneous.h>
-
-/* Keep these in order, they coincide with a server-side enum and must match. */
-enum netplay_host_method
-{
-   NETPLAY_HOST_METHOD_UNKNOWN = 0,
-   NETPLAY_HOST_METHOD_MANUAL,
-   NETPLAY_HOST_METHOD_UPNP,
-   NETPLAY_HOST_METHOD_MITM
-};
-
-#ifdef HAVE_NETPLAYDISCOVERY
-enum rarch_netplay_discovery_ctl_state
-{
-    RARCH_NETPLAY_DISCOVERY_CTL_NONE = 0,
-    RARCH_NETPLAY_DISCOVERY_CTL_LAN_SEND_QUERY,
-    RARCH_NETPLAY_DISCOVERY_CTL_LAN_GET_RESPONSES,
-    RARCH_NETPLAY_DISCOVERY_CTL_LAN_CLEAR_RESPONSES
-};
-
-/** Initialize Netplay discovery */
-bool init_netplay_discovery(void);
-
-/** Deinitialize and free Netplay discovery */
-void deinit_netplay_discovery(void);
-
-/** Discovery control */
-bool netplay_discovery_driver_ctl(enum rarch_netplay_discovery_ctl_state state, void *data);
-#endif
-
-#endif

network/netplay/netplay_frontend.c

@@ -72,7 +72,6 @@
 #endif
 
 #include "netplay.h"
-#include "netplay_discovery.h"
 #include "netplay_private.h"
 
 #if defined(AF_INET6) && !defined(HAVE_SOCKET_LEGACY) && !defined(_3DS)

network/netplay/netplay_room_parse.c

@@ -23,7 +23,6 @@
 #include <compat/strl.h>
 #include <formats/rjson.h>
 #include "netplay.h"
-#include "netplay_discovery.h"
 #include "../../verbosity.h"
 
 enum netplay_parse_state

retroarch.c

@@ -178,7 +178,6 @@
 #ifdef HAVE_NETWORKING
 #include "network/netplay/netplay.h"
 #include "network/netplay/netplay_private.h"
-#include "network/netplay/netplay_discovery.h"
 #endif
 
 #ifdef HAVE_THREADS

tasks/task_netplay_lan_scan.c

@@ -26,7 +26,7 @@
 #endif
 
 #include "../verbosity.h"
-#include "../network/netplay/netplay_discovery.h"
+#include "../network/netplay/netplay.h"
 
 #ifdef HAVE_NETPLAYDISCOVERY
 static void task_netplay_lan_scan_handler(retro_task_t *task)