From a01380f847a469e8c77b7197b83e98bc209dafa8 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Thu, 23 Jul 2020 18:00:57 +0200
Subject: [PATCH] (WiiU) Buildfixes

---
 audio/drivers/wiiu_audio.c | 23 ++++++++++-------------
 input/include/hid_driver.h |  4 ++--
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/audio/drivers/wiiu_audio.c b/audio/drivers/wiiu_audio.c
index 62a868ae32..9bdfa5c5ee 100644
--- a/audio/drivers/wiiu_audio.c
+++ b/audio/drivers/wiiu_audio.c
@@ -187,7 +187,8 @@ static bool ax_audio_start(void* data, bool is_shutdown)
    /* Set back to playing on enough buffered data */
    if (ax->written > AX_AUDIO_SAMPLE_LOAD)
    {
-      AXSetMultiVoiceCurrentOffset(ax->mvoice, ax_audio_limit(ax->pos - ax->written));
+      AXSetMultiVoiceCurrentOffset(ax->mvoice,
+            ax_audio_limit(ax->pos - ax->written));
       AXSetMultiVoiceState(ax->mvoice, AX_VOICE_STATE_PLAYING);
    }
 
@@ -206,9 +207,12 @@ static ssize_t ax_audio_write(void* data, const void* buf, size_t size)
       return 0;
 
    if (count > AX_AUDIO_MAX_FREE)
-      count = AX_AUDIO_MAX_FREE;
+      count            = AX_AUDIO_MAX_FREE;
 
-   count_avail = ((ax->written > AX_AUDIO_MAX_FREE) ? 0 : (AX_AUDIO_MAX_FREE - ax->written));
+   count_avail         = (
+         (ax->written > AX_AUDIO_MAX_FREE) 
+         ? 0 
+         : (AX_AUDIO_MAX_FREE - ax->written));
 
    if (ax->nonblock)
    {
@@ -301,24 +305,17 @@ static void ax_audio_set_nonblock_state(void* data, bool state)
       ax->nonblock = state;
 }
 
-static bool ax_audio_use_float(void* data)
-{
-   (void)data;
-   return false;
-}
+static bool ax_audio_use_float(void* data) { return false; }
 
 static size_t ax_audio_write_avail(void* data)
 {
    ax_audio_t* ax = (ax_audio_t*)data;
-
    size_t ret = AX_AUDIO_COUNT - ax->written;
-
    return (ret < AX_AUDIO_SAMPLE_COUNT ? 0 : ret);
 }
 
 static size_t ax_audio_buffer_size(void* data)
 {
-   (void)data;
    return AX_AUDIO_COUNT;
 }
 
@@ -335,6 +332,6 @@ audio_driver_t audio_ax =
    "AX",
    NULL, /* device_list_new */
    NULL, /* device_list_free */
-   NULL, /* write_avail */
-   NULL, /* buffer_size */
+   ax_audio_write_avail,
+   ax_audio_buffer_size,
 };
diff --git a/input/include/hid_driver.h b/input/include/hid_driver.h
index eed6fa8a18..b7c8a56fd3 100644
--- a/input/include/hid_driver.h
+++ b/input/include/hid_driver.h
@@ -58,8 +58,8 @@ struct hid_driver
    hid_instance.os_driver_data, pad, state)
 #define HID_BUTTON(pad, key) hid_instance.os_driver->button( \
    hid_instance.os_driver_data, pad, key)
-#define HID_AXIS(pad, axis) hid_instance.os_driver->axis( \
-   hid_instance.os_driver_data, pad, axis)
+#define HID_AXIS(pad, a) hid_instance.os_driver->axis( \
+   hid_instance.os_driver_data, pad, (a))
 #define HID_PAD_NAME(pad) \
    hid_instance.os_driver->name(hid_instance.os_driver_data, pad)
 #define HID_SET_PROTOCOL(pad, protocol) \