From fc85cc46d105cf5099436743d42f12297428593b Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Mon, 30 Nov 2015 03:32:34 +0100
Subject: [PATCH] Fix CXX_BUILD

---
 general.h            | 8 ++++----
 input/input_driver.h | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/general.h b/general.h
index 8c7f94a2eb..4937be7268 100644
--- a/general.h
+++ b/general.h
@@ -60,10 +60,6 @@ enum sound_mode_enums
    SOUND_MODE_LAST
 };
 
-#ifdef __cplusplus
-}
-#endif
-
 /**
  * retro_fail:
  * @error_code  : Error code.
@@ -73,4 +69,8 @@ enum sound_mode_enums
  **/
 void retro_fail(int error_code, const char *error);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/input/input_driver.h b/input/input_driver.h
index d4d91cc1fa..e279e51be4 100644
--- a/input/input_driver.h
+++ b/input/input_driver.h
@@ -74,7 +74,7 @@ enum rarch_input_ctl_state
    RARCH_INPUT_CTL_IS_OSK_ENABLED,
    RARCH_INPUT_CTL_SET_KEYBOARD_LINEFEED_ENABLED,
    RARCH_INPUT_CTL_UNSET_KEYBOARD_LINEFEED_ENABLED,
-   RARCH_INPUT_CTL_IS_KEYBOARD_LINEFEED_ENABLED,
+   RARCH_INPUT_CTL_IS_KEYBOARD_LINEFEED_ENABLED
 };
 
 struct retro_keybind