Skip to content

Commit d6cc184

Browse files
committed
Finish converting to SOCKET type in _WIN32 code
fixes c048a21
1 parent 66aa142 commit d6cc184

2 files changed

Lines changed: 8 additions & 3 deletions

File tree

input/input_driver.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,6 @@
6262
#include "../verbosity.h"
6363

6464
#include "../ai/game_ai.h"
65-
#if defined(_WIN32)
66-
#include <winsock2.h>
67-
#endif
6865

6966
#define HOLD_BTN_DELAY_SEC 2
7067

input/input_driver.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,10 @@
3232
#include "../config.h"
3333
#endif /* HAVE_CONFIG_H */
3434

35+
#if defined(_WIN32) && !defined(SOCKET)
36+
#include <winsock2.h>
37+
#endif
38+
3539
#include "input_defines.h"
3640
#include "input_types.h"
3741
#ifdef HAVE_OVERLAY
@@ -284,7 +288,11 @@ struct remote_message
284288
struct input_remote
285289
{
286290
#if defined(HAVE_NETWORKING) && defined(HAVE_NETWORKGAMEPAD)
291+
#ifdef _WIN32
292+
SOCKET net_fd[MAX_USERS];
293+
#else
287294
int net_fd[MAX_USERS];
295+
#endif
288296
#endif
289297
bool state[RARCH_BIND_LIST_END];
290298
};

0 commit comments

Comments
 (0)