From 7ce2ac082af45b92269dddec53b7b0fa8fc16c1c Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Fri, 3 Jun 2016 05:54:21 +0200
Subject: [PATCH] Use retro_common_api.h

---
 input/input_driver.h        | 10 ++++------
 input/input_hid_driver.h    | 13 +++++--------
 input/input_joypad_driver.h | 12 +++++-------
 input/input_keyboard.h      | 11 ++++-------
 input/input_keymaps.h       |  9 +++------
 input/input_overlay.h       |  9 +++------
 input/input_remapping.h     | 12 +++++-------
 ui/ui_companion_driver.h    | 11 ++++-------
 8 files changed, 33 insertions(+), 54 deletions(-)

diff --git a/input/input_driver.h b/input/input_driver.h
index 13c84c2bb7..413327142a 100644
--- a/input/input_driver.h
+++ b/input/input_driver.h
@@ -20,7 +20,9 @@
 #include <stdint.h>
 #include <stddef.h>
 #include <sys/types.h>
+
 #include <boolean.h>
+#include <retro_common_api.h>
 
 #include "input_joypad_driver.h"
 
@@ -32,9 +34,7 @@
 #define MAX_USERS 16
 #endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+RETRO_BEGIN_DECLS
 
 typedef uint64_t retro_input_t;
 
@@ -319,8 +319,6 @@ extern input_driver_t input_qnx;
 extern input_driver_t input_rwebinput;
 extern input_driver_t input_null;
 
-#ifdef __cplusplus
-}
-#endif
+RETRO_END_DECLS
 
 #endif
diff --git a/input/input_hid_driver.h b/input/input_hid_driver.h
index 2a48c67816..ef844a1bd0 100644
--- a/input/input_hid_driver.h
+++ b/input/input_hid_driver.h
@@ -17,15 +17,14 @@
 #ifndef INPUT_HID_DRIVER_H__
 #define INPUT_HID_DRIVER_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <stdint.h>
-#include <boolean.h>
 
+#include <boolean.h>
+#include <retro_common_api.h>
 #include <libretro.h>
 
+RETRO_BEGIN_DECLS
+
 typedef struct hid_driver hid_driver_t;
 
 struct hid_driver
@@ -87,8 +86,6 @@ extern hid_driver_t libusb_hid;
 extern hid_driver_t wiiusb_hid;
 extern hid_driver_t null_hid;
 
-#ifdef __cplusplus
-}
-#endif
+RETRO_END_DECLS
 
 #endif
diff --git a/input/input_joypad_driver.h b/input/input_joypad_driver.h
index ef6d949dbf..f7fd2478a6 100644
--- a/input/input_joypad_driver.h
+++ b/input/input_joypad_driver.h
@@ -17,14 +17,14 @@
 #ifndef INPUT_JOYPAD_DRIVER_H__
 #define INPUT_JOYPAD_DRIVER_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <stdint.h>
+
 #include <boolean.h>
+#include <retro_common_api.h>
 #include <libretro.h>
 
+RETRO_BEGIN_DECLS
+
 typedef struct rarch_joypad_driver input_device_driver_t;
 
 struct rarch_joypad_driver
@@ -225,8 +225,6 @@ extern input_device_driver_t qnx_joypad;
 extern input_device_driver_t null_joypad;
 extern input_device_driver_t mfi_joypad;
 
-#ifdef __cplusplus
-}
-#endif
+RETRO_END_DECLS
 
 #endif
diff --git a/input/input_keyboard.h b/input/input_keyboard.h
index d662ef3042..4c9e0c7ba1 100644
--- a/input/input_keyboard.h
+++ b/input/input_keyboard.h
@@ -17,15 +17,14 @@
 #ifndef INPUT_KEYBOARD_H__
 #define INPUT_KEYBOARD_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <stdint.h>
 
 #include <boolean.h>
+#include <retro_common_api.h>
 #include <libretro.h>
 
+RETRO_BEGIN_DECLS
+
 enum rarch_input_keyboard_ctl_state
 {
    RARCH_INPUT_KEYBOARD_CTL_NONE = 0,
@@ -97,9 +96,7 @@ const char **input_keyboard_start_line(void *userdata,
 
 bool input_keyboard_ctl(enum rarch_input_keyboard_ctl_state state, void *data);
 
-#ifdef __cplusplus
-}
-#endif
+RETRO_END_DECLS
 
 #endif
 
diff --git a/input/input_keymaps.h b/input/input_keymaps.h
index 6a99c17ed1..43d86fc2ae 100644
--- a/input/input_keymaps.h
+++ b/input/input_keymaps.h
@@ -19,11 +19,10 @@
 
 #include <stdint.h>
 
+#include <retro_common_api.h>
 #include <libretro.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+RETRO_BEGIN_DECLS
 
 struct rarch_key_map
 {
@@ -99,9 +98,7 @@ unsigned input_keymaps_translate_rk_to_keysym(enum retro_key key);
  **/
 void input_keymaps_translate_rk_to_str(enum retro_key key, char *buf, size_t size);
 
-#ifdef __cplusplus
-}
-#endif
+RETRO_END_DECLS
 
 #endif
 
diff --git a/input/input_overlay.h b/input/input_overlay.h
index 9b4ba1c445..03b63d0ca1 100644
--- a/input/input_overlay.h
+++ b/input/input_overlay.h
@@ -20,12 +20,11 @@
 #include <stdint.h>
 #include <boolean.h>
 
+#include <retro_common_api.h>
 #include <retro_miscellaneous.h>
 #include <formats/image.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+RETRO_BEGIN_DECLS
 
 #define BOX_RADIAL       0x18df06d2U
 #define BOX_RECT         0x7c9d4d93U
@@ -243,8 +242,6 @@ bool input_overlay_is_alive(input_overlay_t *ol);
 
 void input_overlay_loaded(void *task_data, void *user_data, const char *err);
 
-#ifdef __cplusplus
-}
-#endif
+RETRO_END_DECLS
 
 #endif
diff --git a/input/input_remapping.h b/input/input_remapping.h
index 206747d27d..6e531bb3e1 100644
--- a/input/input_remapping.h
+++ b/input/input_remapping.h
@@ -18,11 +18,11 @@
 
 #include <stdint.h>
 #include <stddef.h>
-#include <boolean.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include <boolean.h>
+#include <retro_common_api.h>
+
+RETRO_BEGIN_DECLS
 
 /**
  * input_remapping_load_file:
@@ -49,8 +49,6 @@ void input_remapping_set_defaults(void);
 void input_remapping_state(unsigned port,
       unsigned *device, unsigned *idx, unsigned *id);
 
-#ifdef __cplusplus
-}
-#endif
+RETRO_END_DECLS
 
 #endif
diff --git a/ui/ui_companion_driver.h b/ui/ui_companion_driver.h
index b2467d31cd..be0ab7c834 100644
--- a/ui/ui_companion_driver.h
+++ b/ui/ui_companion_driver.h
@@ -18,8 +18,9 @@
 #define __UI_COMPANION_DRIVER_H
 
 #include <stddef.h>
-#include <boolean.h>
 
+#include <boolean.h>
+#include <retro_common_api.h>
 #include <lists/file_list.h>
 
 #ifdef HAVE_CONFIG_H
@@ -28,9 +29,7 @@
 
 #include "../command.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+RETRO_BEGIN_DECLS
 
 typedef struct ui_companion_driver
 {
@@ -94,8 +93,6 @@ void ui_companion_driver_toggle(void);
 
 void ui_companion_driver_free(void);
 
-#ifdef __cplusplus
-}
-#endif
+RETRO_END_DECLS
 
 #endif