diff --git a/ctr/gpu_old.h b/ctr/gpu_old.h
index 287209e162..e632282866 100644
--- a/ctr/gpu_old.h
+++ b/ctr/gpu_old.h
@@ -6,7 +6,8 @@
* @description These functions have been superseeded by direct GPU register writes, or external GPU libraries.
* @deprecated
*/
-#pragma once
+#ifndef _CTR_GPU_OLD_H
+#define _CTR_GPU_OLD_H
#include <3ds/gpu/gpu.h>
@@ -237,3 +238,5 @@ void GPU_DrawElements(GPU_Primitive_t primitive, u32* indexArray, u32 n) DEPRECA
void GPU_FinishDrawing() DEPRECATED;
void GPU_Finalize(void) DEPRECATED;
+
+#endif
diff --git a/gfx/common/d3dcompiler_common.c b/gfx/common/d3dcompiler_common.c
index 6cbc8d08a3..8ea35ad303 100644
--- a/gfx/common/d3dcompiler_common.c
+++ b/gfx/common/d3dcompiler_common.c
@@ -22,6 +22,7 @@
#endif
#include "d3dcompiler_common.h"
+#include "dxgi_common.h"
#include "../../verbosity.h"
#if defined(HAVE_DYLIB) && !defined(__WINRT__)
diff --git a/gfx/common/d3dcompiler_common.h b/gfx/common/d3dcompiler_common.h
index 0ccd7a19d8..292cf13fe6 100644
--- a/gfx/common/d3dcompiler_common.h
+++ b/gfx/common/d3dcompiler_common.h
@@ -13,20 +13,20 @@
* If not, see .
*/
-#pragma once
+#ifndef _D3DCOMPILER_COMMON_H
+#define _D3DCOMPILER_COMMON_H
#include
#include
-#include "dxgi_common.h"
#include
#include
-/* auto-generated */
typedef ID3DBlob* D3DBlob;
-/* end of auto-generated */
bool d3d_compile(const char* src, size_t size,
LPCSTR src_name, LPCSTR entrypoint, LPCSTR target, D3DBlob* out);
bool d3d_compile_from_file(LPCWSTR filename, LPCSTR entrypoint, LPCSTR target, D3DBlob* out);
+
+#endif
diff --git a/gfx/common/wayland_common.h b/gfx/common/wayland_common.h
index 4140d317d1..9369f42ce5 100644
--- a/gfx/common/wayland_common.h
+++ b/gfx/common/wayland_common.h
@@ -13,7 +13,8 @@
* If not, see .
*/
-#pragma once
+#ifndef _WAYLAND_COMMON_H
+#define _WAYLAND_COMMON_H
#ifdef HAVE_LIBDECOR_H
#include
@@ -91,3 +92,4 @@ void gfx_ctx_wl_check_window_common(gfx_ctx_wayland_data_t *wl,
extern const struct libdecor_interface libdecor_interface;
#endif
+#endif
diff --git a/gfx/drivers/gx2_shaders/menu_shaders.h b/gfx/drivers/gx2_shaders/menu_shaders.h
index aab4aeda46..948f6fad07 100644
--- a/gfx/drivers/gx2_shaders/menu_shaders.h
+++ b/gfx/drivers/gx2_shaders/menu_shaders.h
@@ -13,7 +13,8 @@
* If not, see .
*/
-#pragma once
+#ifndef _GX2_MENU_SHADERS_H
+#define _GX2_MENU_SHADERS_H
#include
@@ -40,3 +41,5 @@ extern GX2Shader snowflake_shader;
#ifdef __cplusplus
}
#endif
+
+#endif
diff --git a/input/common/input_x11_common.h b/input/common/input_x11_common.h
index a0cd0342d5..b4d1c8961e 100644
--- a/input/common/input_x11_common.h
+++ b/input/common/input_x11_common.h
@@ -19,10 +19,10 @@
#include
-#include
-
#include
+#include
+
#include "../../driver.h"
int16_t x_mouse_state_wheel(unsigned id);
diff --git a/input/common/wayland_common.h b/input/common/wayland_common.h
index 6acdf645af..6127e497a5 100644
--- a/input/common/wayland_common.h
+++ b/input/common/wayland_common.h
@@ -13,7 +13,8 @@
* If not, see .
*/
-#pragma once
+#ifndef _WAYLAND_COMMON_H
+#define _WAYLAND_COMMON_H
#include
#include
@@ -253,3 +254,5 @@ extern const struct wl_buffer_listener shm_buffer_listener;
extern const struct wl_data_device_listener data_device_listener;
extern const struct wl_data_offer_listener data_offer_listener;
+
+#endif
diff --git a/input/input_keymaps.h b/input/input_keymaps.h
index 3a8cbe3674..e9a2e1be0a 100644
--- a/input/input_keymaps.h
+++ b/input/input_keymaps.h
@@ -22,48 +22,9 @@
#include
#include
-RETRO_BEGIN_DECLS
-
-struct rarch_key_map
-{
- unsigned sym;
- enum retro_key rk;
-};
-
-struct input_key_map
-{
- const char *str;
- enum retro_key key;
-};
-
#define RARCH_KEY_MAP_RWEBINPUT_SIZE 111
-extern const struct input_key_map input_config_key_map[];
-
-extern const struct rarch_key_map rarch_key_map_x11[];
-extern const struct rarch_key_map rarch_key_map_sdl[];
-extern const struct rarch_key_map rarch_key_map_sdl2[];
-extern const struct rarch_key_map rarch_key_map_dinput[];
-
- /* is generated at runtime so can't be const */
-extern struct rarch_key_map rarch_key_map_rwebinput[RARCH_KEY_MAP_RWEBINPUT_SIZE];
-
-extern const struct rarch_key_map rarch_key_map_linux[];
-extern const struct rarch_key_map rarch_key_map_apple_hid[];
-extern const struct rarch_key_map rarch_key_map_android[];
-extern const struct rarch_key_map rarch_key_map_qnx[];
-extern const struct rarch_key_map rarch_key_map_dos[];
-extern const struct rarch_key_map rarch_key_map_wiiu[];
-extern const struct rarch_key_map rarch_key_map_winraw[];
-#ifdef HAVE_LIBNX
-extern const struct rarch_key_map rarch_key_map_switch[];
-#endif
-#ifdef VITA
-extern const struct rarch_key_map rarch_key_map_vita[];
-#endif
-#ifdef ORBIS
-extern const struct rarch_key_map rarch_key_map_ps4[];
-#endif
+RETRO_BEGIN_DECLS
#if defined(_WIN32) && _WIN32_WINNT >= 0x0501 && !defined(__WINRT__)
enum winraw_scancodes
@@ -228,6 +189,18 @@ enum winraw_scancodes
};
#endif
+struct rarch_key_map
+{
+ unsigned sym;
+ enum retro_key rk;
+};
+
+struct input_key_map
+{
+ const char *str;
+ enum retro_key key;
+};
+
/**
* input_keymaps_init_keyboard_lut:
* @map : Keyboard map.
@@ -260,6 +233,33 @@ void input_keymaps_translate_rk_to_str(enum retro_key key, char *buf, size_t siz
extern enum retro_key rarch_keysym_lut[RETROK_LAST];
+extern const struct input_key_map input_config_key_map[];
+
+extern const struct rarch_key_map rarch_key_map_x11[];
+extern const struct rarch_key_map rarch_key_map_sdl[];
+extern const struct rarch_key_map rarch_key_map_sdl2[];
+extern const struct rarch_key_map rarch_key_map_dinput[];
+
+ /* is generated at runtime so can't be const */
+extern struct rarch_key_map rarch_key_map_rwebinput[RARCH_KEY_MAP_RWEBINPUT_SIZE];
+
+extern const struct rarch_key_map rarch_key_map_linux[];
+extern const struct rarch_key_map rarch_key_map_apple_hid[];
+extern const struct rarch_key_map rarch_key_map_android[];
+extern const struct rarch_key_map rarch_key_map_qnx[];
+extern const struct rarch_key_map rarch_key_map_dos[];
+extern const struct rarch_key_map rarch_key_map_wiiu[];
+extern const struct rarch_key_map rarch_key_map_winraw[];
+#ifdef HAVE_LIBNX
+extern const struct rarch_key_map rarch_key_map_switch[];
+#endif
+#ifdef VITA
+extern const struct rarch_key_map rarch_key_map_vita[];
+#endif
+#ifdef ORBIS
+extern const struct rarch_key_map rarch_key_map_ps4[];
+#endif
+
RETRO_END_DECLS
#endif
diff --git a/input/input_types.h b/input/input_types.h
index 54cafb8075..301d6d6842 100644
--- a/input/input_types.h
+++ b/input/input_types.h
@@ -129,4 +129,5 @@ typedef struct input_driver input_driver_t;
typedef struct input_keyboard_ctx_wait input_keyboard_ctx_wait_t;
typedef struct turbo_buttons turbo_buttons_t;
typedef struct joypad_connection joypad_connection_t;
+
#endif /* __INPUT_TYPES__H */
diff --git a/menu/menu_driver.h b/menu/menu_driver.h
index 000fef6f5f..c4c90f7763 100644
--- a/menu/menu_driver.h
+++ b/menu/menu_driver.h
@@ -76,6 +76,10 @@ RETRO_BEGIN_DECLS
#define MENU_SETTINGS_CHEEVOS_START 0x40000
#define MENU_SETTINGS_NETPLAY_ROOMS_START 0x80000
+/* "Normalize" non-alphabetical entries so they
+ * are lumped together for purposes of jumping. */
+#define ELEM_GET_FIRST_CHAR(ret) ((ret < 'a') ? ('a' - 1) : (ret > 'z') ? ('z' + 1) : ret)
+
enum menu_settings_type
{
MENU_SETTINGS_NONE = FILE_TYPE_LAST + 1,
@@ -301,6 +305,53 @@ enum menu_settings_type
MENU_SETTINGS_LAST
};
+enum menu_state_flags
+{
+ MENU_ST_FLAG_ALIVE = (1 << 0),
+ MENU_ST_FLAG_IS_BINDING = (1 << 1),
+ MENU_ST_FLAG_INP_DLG_KB_DISPLAY = (1 << 2),
+ /* When enabled, on next iteration the 'Quick Menu'
+ * list will be pushed onto the stack */
+ MENU_ST_FLAG_PENDING_QUICK_MENU = (1 << 3),
+ MENU_ST_FLAG_PREVENT_POPULATE = (1 << 4),
+ /* The menu driver owns the userdata */
+ MENU_ST_FLAG_DATA_OWN = (1 << 5),
+ /* Flagged when menu entries need to be refreshed */
+ MENU_ST_FLAG_ENTRIES_NEED_REFRESH = (1 << 6),
+ MENU_ST_FLAG_ENTRIES_NONBLOCKING_REFRESH = (1 << 7),
+ /* 'Close Content'-hotkey menu resetting */
+ MENU_ST_FLAG_PENDING_CLOSE_CONTENT = (1 << 8),
+ /* Flagged when a core calls RETRO_ENVIRONMENT_SHUTDOWN,
+ * requiring the menu to be flushed on the next iteration */
+ MENU_ST_FLAG_PENDING_ENV_SHUTDOWN_FLUSH = (1 << 9),
+ /* Screensaver status
+ * - Does menu driver support screensaver functionality?
+ * - Is screensaver currently active? */
+ MENU_ST_FLAG_SCREENSAVER_SUPPORTED = (1 << 10),
+ MENU_ST_FLAG_SCREENSAVER_ACTIVE = (1 << 11)
+};
+
+enum menu_scroll_mode
+{
+ MENU_SCROLL_PAGE = 0,
+ MENU_SCROLL_START_LETTER
+};
+
+enum contentless_core_runtime_status
+{
+ CONTENTLESS_CORE_RUNTIME_UNKNOWN = 0,
+ CONTENTLESS_CORE_RUNTIME_MISSING,
+ CONTENTLESS_CORE_RUNTIME_VALID
+};
+
+enum action_iterate_type
+{
+ ITERATE_TYPE_DEFAULT = 0,
+ ITERATE_TYPE_HELP,
+ ITERATE_TYPE_INFO,
+ ITERATE_TYPE_BIND
+};
+
struct menu_list
{
file_list_t **menu_stack;
@@ -455,38 +506,6 @@ typedef struct
char detect_content_path[PATH_MAX_LENGTH];
} menu_handle_t;
-enum menu_state_flags
-{
- MENU_ST_FLAG_ALIVE = (1 << 0),
- MENU_ST_FLAG_IS_BINDING = (1 << 1),
- MENU_ST_FLAG_INP_DLG_KB_DISPLAY = (1 << 2),
- /* When enabled, on next iteration the 'Quick Menu'
- * list will be pushed onto the stack */
- MENU_ST_FLAG_PENDING_QUICK_MENU = (1 << 3),
- MENU_ST_FLAG_PREVENT_POPULATE = (1 << 4),
- /* The menu driver owns the userdata */
- MENU_ST_FLAG_DATA_OWN = (1 << 5),
- /* Flagged when menu entries need to be refreshed */
- MENU_ST_FLAG_ENTRIES_NEED_REFRESH = (1 << 6),
- MENU_ST_FLAG_ENTRIES_NONBLOCKING_REFRESH = (1 << 7),
- /* 'Close Content'-hotkey menu resetting */
- MENU_ST_FLAG_PENDING_CLOSE_CONTENT = (1 << 8),
- /* Flagged when a core calls RETRO_ENVIRONMENT_SHUTDOWN,
- * requiring the menu to be flushed on the next iteration */
- MENU_ST_FLAG_PENDING_ENV_SHUTDOWN_FLUSH = (1 << 9),
- /* Screensaver status
- * - Does menu driver support screensaver functionality?
- * - Is screensaver currently active? */
- MENU_ST_FLAG_SCREENSAVER_SUPPORTED = (1 << 10),
- MENU_ST_FLAG_SCREENSAVER_ACTIVE = (1 << 11)
-};
-
-enum menu_scroll_mode
-{
- MENU_SCROLL_PAGE = 0,
- MENU_SCROLL_START_LETTER
-};
-
struct menu_state
{
/* Timers */
@@ -562,7 +581,6 @@ struct menu_state
char input_dialog_kb_label[256];
#endif
unsigned char kb_key_state[RETROK_LAST];
-
};
typedef struct menu_content_ctx_defer_info
@@ -608,6 +626,40 @@ typedef struct menu_ctx_bind
unsigned type;
} menu_ctx_bind_t;
+#if defined(HAVE_LIBRETRODB)
+typedef struct explore_state explore_state_t;
+#endif
+
+typedef struct
+{
+ char *runtime_str;
+ char *last_played_str;
+ enum contentless_core_runtime_status status;
+} contentless_core_runtime_info_t;
+
+typedef struct
+{
+ char *licenses_str;
+ contentless_core_runtime_info_t runtime;
+} contentless_core_info_entry_t;
+
+#if defined(HAVE_LIBRETRODB)
+explore_state_t *menu_explore_build_list(const char *directory_playlist,
+ const char *directory_database);
+uintptr_t menu_explore_get_entry_icon(unsigned type);
+ssize_t menu_explore_get_entry_playlist_index(unsigned type,
+ playlist_t **playlist, const struct playlist_entry **entry,
+ file_list_t *list, size_t *list_pos, size_t *list_size);
+ssize_t menu_explore_set_playlist_thumbnail(unsigned type,
+ gfx_thumbnail_path_data_t *thumbnail_path_data); /* returns list index */
+bool menu_explore_is_content_list(void);
+void menu_explore_context_init(void);
+void menu_explore_context_deinit(void);
+void menu_explore_free_state(explore_state_t *state);
+void menu_explore_free(void);
+void menu_explore_set_state(explore_state_t *state);
+#endif
+
const char *menu_driver_ident(void);
bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data);
@@ -628,45 +680,6 @@ void menu_display_handle_wallpaper_upload(retro_task_t *task,
void *task_data,
void *user_data, const char *err);
-#if defined(HAVE_LIBRETRODB)
-typedef struct explore_state explore_state_t;
-explore_state_t *menu_explore_build_list(const char *directory_playlist,
- const char *directory_database);
-uintptr_t menu_explore_get_entry_icon(unsigned type);
-ssize_t menu_explore_get_entry_playlist_index(unsigned type,
- playlist_t **playlist, const struct playlist_entry **entry,
- file_list_t *list, size_t *list_pos, size_t *list_size);
-ssize_t menu_explore_set_playlist_thumbnail(unsigned type,
- gfx_thumbnail_path_data_t *thumbnail_path_data); /* returns list index */
-bool menu_explore_is_content_list(void);
-void menu_explore_context_init(void);
-void menu_explore_context_deinit(void);
-void menu_explore_free_state(explore_state_t *state);
-void menu_explore_free(void);
-void menu_explore_set_state(explore_state_t *state);
-#endif
-
-/* Contentless cores START */
-enum contentless_core_runtime_status
-{
- CONTENTLESS_CORE_RUNTIME_UNKNOWN = 0,
- CONTENTLESS_CORE_RUNTIME_MISSING,
- CONTENTLESS_CORE_RUNTIME_VALID
-};
-
-typedef struct
-{
- char *runtime_str;
- char *last_played_str;
- enum contentless_core_runtime_status status;
-} contentless_core_runtime_info_t;
-
-typedef struct
-{
- char *licenses_str;
- contentless_core_runtime_info_t runtime;
-} contentless_core_info_entry_t;
-
uintptr_t menu_contentless_cores_get_entry_icon(const char *core_id);
void menu_contentless_cores_context_init(void);
void menu_contentless_cores_context_deinit(void);
@@ -676,7 +689,6 @@ void menu_contentless_cores_set_runtime(const char *core_id,
void menu_contentless_cores_get_info(const char *core_id,
const contentless_core_info_entry_t **info);
void menu_contentless_cores_flush_runtime(void);
-/* Contentless cores END */
/* Returns true if search filter is enabled
* for the specified menu list */
@@ -696,20 +708,8 @@ void menu_driver_set_pending_selection(const char *pending_selection);
struct menu_state *menu_state_get_ptr(void);
-enum action_iterate_type
-{
- ITERATE_TYPE_DEFAULT = 0,
- ITERATE_TYPE_HELP,
- ITERATE_TYPE_INFO,
- ITERATE_TYPE_BIND
-};
-
int generic_menu_entry_action(void *userdata, menu_entry_t *entry, size_t i, enum menu_action action);
-/* "Normalize" non-alphabetical entries so they
- * are lumped together for purposes of jumping. */
-#define ELEM_GET_FIRST_CHAR(ret) ((ret < 'a') ? ('a' - 1) : (ret > 'z') ? ('z' + 1) : ret)
-
void menu_entries_build_scroll_indices(
struct menu_state *menu_st,
file_list_t *list);
@@ -721,13 +721,6 @@ void get_current_menu_value(struct menu_state *menu_st,
void menu_driver_destroy(
struct menu_state *menu_st);
-extern menu_ctx_driver_t menu_ctx_ozone;
-extern menu_ctx_driver_t menu_ctx_xui;
-extern menu_ctx_driver_t menu_ctx_rgui;
-extern menu_ctx_driver_t menu_ctx_mui;
-extern menu_ctx_driver_t menu_ctx_xmb;
-extern menu_ctx_driver_t menu_ctx_stripes;
-
const menu_ctx_driver_t *menu_driver_find_driver(
settings_t *settings,
const char *prefix,
@@ -798,6 +791,14 @@ bool menu_input_key_bind_set_mode(
extern const menu_ctx_driver_t *menu_ctx_drivers[];
+extern menu_ctx_driver_t menu_ctx_ozone;
+extern menu_ctx_driver_t menu_ctx_xui;
+extern menu_ctx_driver_t menu_ctx_rgui;
+extern menu_ctx_driver_t menu_ctx_mui;
+extern menu_ctx_driver_t menu_ctx_xmb;
+extern menu_ctx_driver_t menu_ctx_stripes;
+
+
RETRO_END_DECLS
#endif
diff --git a/menu/menu_entries.h b/menu/menu_entries.h
index 85e2913d8c..bdf44c9d94 100644
--- a/menu/menu_entries.h
+++ b/menu/menu_entries.h
@@ -82,7 +82,6 @@ enum menu_entry_flags
MENU_ENTRY_FLAG_CHECKED = (1 << 5)
};
-
typedef struct menu_ctx_list
{
const char *path;
diff --git a/uwp/uwp_file_handle_access.h b/uwp/uwp_file_handle_access.h
index e7eaea911e..97ef724b9a 100644
--- a/uwp/uwp_file_handle_access.h
+++ b/uwp/uwp_file_handle_access.h
@@ -1,8 +1,8 @@
#pragma once
-// These are copied from WindowsStorageCOM.h
-// You can remove this header file once the real file has been updated
-// to fix the WINAPI_PARTITION_DESKTOP block
+/* These are copied from WindowsStorageCOM.h
+ * You can remove this header file once the real file has been updated
+ * to fix the WINAPI_PARTITION_DESKTOP block */
typedef interface IOplockBreakingHandler IOplockBreakingHandler;
typedef interface IStorageItemHandleAccess IStorageItemHandleAccess;
diff --git a/uwp/uwp_func.h b/uwp/uwp_func.h
index 2d65a7afa4..8d5e00bf1f 100644
--- a/uwp/uwp_func.h
+++ b/uwp/uwp_func.h
@@ -22,10 +22,6 @@
extern "C" {
#endif
-extern char uwp_dir_install[PATH_MAX_LENGTH];
-extern char uwp_dir_data[PATH_MAX_LENGTH];
-extern char uwp_device_family[128];
-
void uwp_open_broadfilesystemaccess_settings(void);
void* uwp_get_corewindow(void);
@@ -46,6 +42,11 @@ void uwp_fill_installed_core_packages(struct string_list *list);
extern const struct rarch_key_map rarch_key_map_uwp[];
+extern char uwp_dir_install[PATH_MAX_LENGTH];
+extern char uwp_dir_data[PATH_MAX_LENGTH];
+extern char uwp_device_family[128];
+
+
#ifdef __cplusplus
}
#endif
diff --git a/uwp/uwp_main.h b/uwp/uwp_main.h
index 8be6f321e1..ddadf0f458 100644
--- a/uwp/uwp_main.h
+++ b/uwp/uwp_main.h
@@ -13,19 +13,20 @@
* If not, see .
*/
-#pragma once
+#ifndef _UWP_MAIN_H
+#define _UPW_MAIN_H
#include "uwp_main.h"
namespace RetroArchUWP
{
- // Main entry point for our app. Connects the app with the Windows shell and handles application lifecycle events.
+ /* Main entry point for our app. Connects the app with the Windows shell and handles application lifecycle events. */
ref class App sealed : public Windows::ApplicationModel::Core::IFrameworkView
{
public:
App();
- // IFrameworkView methods.
+ /* IFrameworkView methods. */
virtual void Initialize(Windows::ApplicationModel::Core::CoreApplicationView^ applicationView);
virtual void SetWindow(Windows::UI::Core::CoreWindow^ window);
virtual void Load(Platform::String^ entryPoint);
@@ -33,7 +34,7 @@ namespace RetroArchUWP
virtual void Uninitialize();
protected:
- // Application lifecycle event handlers.
+ /* Application lifecycle event handlers. */
void OnActivated(Windows::ApplicationModel::Core::CoreApplicationView^ applicationView, Windows::ApplicationModel::Activation::IActivatedEventArgs^ args);
void OnSuspending(Platform::Object^ sender, Windows::ApplicationModel::SuspendingEventArgs^ args);
void OnResuming(Platform::Object^ sender, Platform::Object^ args);
@@ -41,7 +42,7 @@ namespace RetroArchUWP
void OnBackRequested(Platform::Object^ sender, Windows::UI::Core::BackRequestedEventArgs^ args);
- // Window event handlers.
+ /* Window event handlers. */
void OnWindowSizeChanged(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::WindowSizeChangedEventArgs^ args);
void OnVisibilityChanged(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::VisibilityChangedEventArgs^ args);
void OnWindowClosed(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::CoreWindowEventArgs^ args);
@@ -49,7 +50,7 @@ namespace RetroArchUWP
void OnKey(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::KeyEventArgs^ args);
void OnPointer(Windows::UI::Core::CoreWindow^ sender, Windows::UI::Core::PointerEventArgs^ args);
- // DisplayInformation event handlers.
+ /* DisplayInformation event handlers. */
void OnDpiChanged(Windows::Graphics::Display::DisplayInformation^ sender, Platform::Object^ args);
void OnOrientationChanged(Windows::Graphics::Display::DisplayInformation^ sender, Platform::Object^ args);
void OnDisplayContentsInvalidated(Windows::Graphics::Display::DisplayInformation^ sender, Platform::Object^ args);
@@ -83,3 +84,5 @@ ref class Direct3DApplicationSource sealed : Windows::ApplicationModel::Core::IF
public:
virtual Windows::ApplicationModel::Core::IFrameworkView^ CreateView();
};
+
+#endif
diff --git a/wiiu/shader_utils.h b/wiiu/shader_utils.h
index 1d44aa48fc..ecf1ca632a 100644
--- a/wiiu/shader_utils.h
+++ b/wiiu/shader_utils.h
@@ -1,4 +1,5 @@
-#pragma once
+#ifndef _GX2_SHADER_UTILS_H
+#define _GX2_SHADER_UTILS_H
#include
@@ -86,3 +87,5 @@ void gfd_free(GFDFile* gfd);
#ifdef __cplusplus
}
#endif
+
+#endif