Fix CXX_BUILD

menu/drivers/nuklear/nk_common.h

@@ -15,6 +15,9 @@
  *  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef _NK_COMMON_H
+#define _NK_COMMON_H
+
  /*  This file is intended for backend code. */
 
 #define NK_INCLUDE_FIXED_TYPES
@@ -80,3 +83,5 @@ void* nk_common_mem_alloc(nk_handle a, void *old, nk_size b);
 void nk_common_mem_free(nk_handle unused, void *ptr);
 
 void device_upload_atlas(struct nk_device *dev, const void *image, int width, int height);
+
+#endif

menu/drivers/nuklear/nk_menu.h

@@ -17,6 +17,9 @@
 
 /*  This file is intended for helper functions, custom controls, etc. */
 
+#ifndef _NK_MENU_H
+#define _NK_MENU_H
+
 #include "nk_common.h"
 #include "../../menu_display.h"
 #include "../../menu_input.h"
@@ -94,4 +97,9 @@ void nk_wnd_shader_parameters(nk_menu_handle_t *zr);
 void nk_wnd_main(nk_menu_handle_t *zr);
 void nk_wnd_file_picker(nk_menu_handle_t *zr);
 void nk_wnd_settings(nk_menu_handle_t *zr);
+void nk_wnd_set_state(nk_menu_handle_t *zr, const int id,
+   struct nk_vec2 pos, struct nk_vec2 size);
+void nk_wnd_get_state(nk_menu_handle_t *zr, const int id,
+   struct nk_vec2 *pos, struct nk_vec2 *size);
 
+#endif

tasks/tasks_internal.h

@@ -26,10 +26,6 @@
 #include "../core_type.h"
 #include "../runloop.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 enum content_mode_load
 {
    CONTENT_MODE_LOAD_NONE = 0,
@@ -133,8 +129,4 @@ bool take_screenshot(void);
 bool dump_to_file_desperate(const void *data,
       size_t size, unsigned type);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif