From 03b232552e52d5c7c612136408070d4a12130d9a Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 29 Jun 2020 13:53:40 +0200
Subject: [PATCH] (MSVC) Buildfix

---
 libretro-common/rthreads/rthreads.c | 16 ++++++++++++++++
 retroarch.c                         |  7 +++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/libretro-common/rthreads/rthreads.c b/libretro-common/rthreads/rthreads.c
index edd6bbc992..5220827e38 100644
--- a/libretro-common/rthreads/rthreads.c
+++ b/libretro-common/rthreads/rthreads.c
@@ -339,8 +339,16 @@ slock_t *slock_new(void)
 #ifdef USE_WIN32_THREADS
    lock->lock.LockCount      = 0;
    lock->lock.RecursionCount = 0;
+#ifdef _XBOX
+   lock->lock.OwningThread   = 0;
+   lock->lock.Synchronization.RawEvent[0] = 0;
+   lock->lock.Synchronization.RawEvent[1] = 0;
+   lock->lock.Synchronization.RawEvent[2] = 0;
+   lock->lock.Synchronization.RawEvent[3] = 0;
+#else
    lock->lock.LockSemaphore  = NULL;
    lock->lock.SpinCount      = 0;
+#endif
    InitializeCriticalSection(&lock->lock);
    mutex_created             = true;
 #else
@@ -477,8 +485,16 @@ scond_t *scond_new(void)
    cond->head              = NULL;
    cond->cs.LockCount      = 0;
    cond->cs.RecursionCount = 0;
+#ifdef _XBOX
+   cond->cs.OwningThread   = 0;
+   cond->cs.Synchronization.RawEvent[0] = 0;
+   cond->cs.Synchronization.RawEvent[1] = 0;
+   cond->cs.Synchronization.RawEvent[2] = 0;
+   cond->cs.Synchronization.RawEvent[3] = 0;
+#else
    cond->cs.LockSemaphore  = NULL;
    cond->cs.SpinCount      = 0;
+#endif
    cond->event             = CreateEvent(NULL, FALSE, FALSE, NULL);
    if (!cond->event)
       goto error;
diff --git a/retroarch.c b/retroarch.c
index 24a38f4cb1..42999d53dd 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -12774,7 +12774,9 @@ static bool command_stdin_init(command_t *handle)
    return true;
 }
 
-static void command_stdin_poll(command_t *handle)
+static void command_stdin_poll(
+	struct rarch_state *p_rarch,
+		command_t *handle)
 {
    ptrdiff_t msg_len;
    char *last_newline = NULL;
@@ -23380,7 +23382,8 @@ static void input_driver_poll(void)
 
 #ifdef HAVE_STDIN_CMD
       if (p_rarch->input_driver_command->stdin_enable)
-         command_stdin_poll(p_rarch->input_driver_command);
+         command_stdin_poll(p_rarch,
+		 p_rarch->input_driver_command);
 #endif
    }
 #endif