From f1511e76f15cc449d9c46dc3bafd5dad8aa63432 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 12 Oct 2014 20:22:33 +0200
Subject: [PATCH] (Menu) Add missing extern C namespaces for C++ builds

---
 frontend/menu/menu_action.h        | 8 ++++++++
 frontend/menu/menu_animation.h     | 8 ++++++++
 frontend/menu/menu_entries.h       | 8 ++++++++
 frontend/menu/menu_entries_cbs.h   | 8 ++++++++
 frontend/menu/menu_input_line_cb.h | 8 ++++++++
 frontend/menu/menu_navigation.h    | 8 ++++++++
 frontend/menu/menu_shader.h        | 8 ++++++++
 7 files changed, 56 insertions(+)

diff --git a/frontend/menu/menu_action.h b/frontend/menu/menu_action.h
index 8d7f3f213c..20d40724fe 100644
--- a/frontend/menu/menu_action.h
+++ b/frontend/menu/menu_action.h
@@ -19,6 +19,10 @@
 
 #include "../../settings_data.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 int menu_action_setting_apply(rarch_setting_t *setting);
 
 int menu_action_setting_boolean(
@@ -48,4 +52,8 @@ int menu_action_setting_set(unsigned id, const char *label,
 int menu_action_handle_setting(rarch_setting_t *setting,
       unsigned id, const char *label, unsigned action);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/frontend/menu/menu_animation.h b/frontend/menu/menu_animation.h
index 8cd8241546..55b6d8a6c1 100644
--- a/frontend/menu/menu_animation.h
+++ b/frontend/menu/menu_animation.h
@@ -20,6 +20,10 @@
 #include <stdint.h>
 #include <stdlib.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 typedef float (*easingFunc)(float, float, float, float);
 typedef void  (*tweenCallback) (void);
 
@@ -108,4 +112,8 @@ float inOutBounce(float t, float b, float c, float d);
 
 float outInBounce(float t, float b, float c, float d);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/frontend/menu/menu_entries.h b/frontend/menu/menu_entries.h
index 6921d3c7ad..673231ba85 100644
--- a/frontend/menu/menu_entries.h
+++ b/frontend/menu/menu_entries.h
@@ -22,6 +22,10 @@
 #include "../../file_list.h"
 #include "../../settings_data.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 void menu_entries_push(file_list_t *list,
       const char *path, const char *label, unsigned type,
       size_t directory_ptr);
@@ -46,4 +50,8 @@ int menu_entries_set_current_path_selection(
       const char *label, unsigned type,
       unsigned action);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/frontend/menu/menu_entries_cbs.h b/frontend/menu/menu_entries_cbs.h
index ec2b77c6fd..17b97523d1 100644
--- a/frontend/menu/menu_entries_cbs.h
+++ b/frontend/menu/menu_entries_cbs.h
@@ -18,8 +18,16 @@
 
 #include <stdlib.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 void menu_entries_cbs_init(void *data,
       const char *path, const char *label,
       unsigned type, size_t index);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/frontend/menu/menu_input_line_cb.h b/frontend/menu/menu_input_line_cb.h
index 9e46dc0fab..2f3fdfccfe 100644
--- a/frontend/menu/menu_input_line_cb.h
+++ b/frontend/menu/menu_input_line_cb.h
@@ -19,6 +19,10 @@
 
 #include "../../input/keyboard_line.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 void menu_key_event(bool down, unsigned keycode, uint32_t character,
       uint16_t key_modifiers);
 
@@ -42,4 +46,8 @@ int menu_input_bind_iterate(void *data);
 
 int menu_input_bind_iterate_keyboard(void *data);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/frontend/menu/menu_navigation.h b/frontend/menu/menu_navigation.h
index 4f79dd92cd..65b7dc5f4b 100644
--- a/frontend/menu/menu_navigation.h
+++ b/frontend/menu/menu_navigation.h
@@ -19,6 +19,10 @@
 
 #include "menu_common.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 void menu_clear_navigation(menu_handle_t *menu);
 
 void menu_decrement_navigation(menu_handle_t *menu);
@@ -33,4 +37,8 @@ void menu_descend_alphabet(menu_handle_t *menu, size_t *ptr_out);
 
 void menu_ascend_alphabet(menu_handle_t *menu, size_t *ptr_out);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/frontend/menu/menu_shader.h b/frontend/menu/menu_shader.h
index 833b374b81..502b036c29 100644
--- a/frontend/menu/menu_shader.h
+++ b/frontend/menu/menu_shader.h
@@ -23,6 +23,10 @@
 
 #include "../../gfx/shader/shader_context.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 void menu_shader_manager_init(void *data);
 
 void menu_shader_manager_set_preset(struct gfx_shader *shader,
@@ -43,4 +47,8 @@ void menu_shader_manager_get_str(struct gfx_shader *shader,
 
 void menu_shader_manager_apply_changes(void);
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif