From 9fd8fc6eedeb53c8d6d64195bb74f5e336f21510 Mon Sep 17 00:00:00 2001 From: Relintai Date: Thu, 17 Mar 2022 22:38:14 +0100 Subject: [PATCH] Same change to classes under platform. --- platform/android/android_input_handler.h | 6 ++++-- platform/android/android_keys_utils.h | 6 ++++-- platform/android/api/api.h | 6 ++++-- platform/android/api/java_class_wrapper.h | 6 ++++-- platform/android/api/jni_singleton.h | 6 ++++-- platform/android/audio_driver_opensl.h | 6 ++++-- platform/android/dir_access_jandroid.h | 6 ++++-- platform/android/file_access_android.h | 6 ++++-- platform/android/java_godot_io_wrapper.h | 6 ++++-- platform/android/java_godot_lib_jni.h | 6 ++++-- platform/android/java_godot_wrapper.h | 6 ++++-- platform/android/jni_utils.h | 6 ++++-- platform/android/net_socket_android.h | 6 ++++-- platform/android/os_android.h | 6 ++++-- platform/android/plugin/godot_plugin_jni.h | 6 ++++-- platform/android/power_android.h | 6 ++++-- platform/android/string_android.h | 6 ++++-- platform/android/thread_jandroid.h | 6 ++++-- platform/iphone/api/api.h | 6 ++++-- platform/iphone/ios.h | 6 ++++-- platform/iphone/os_iphone.h | 6 ++++-- platform/iphone/plugin/godot_plugin_config.h | 6 ++++-- platform/iphone/power_iphone.h | 6 ++++-- platform/javascript/api/api.h | 6 ++++-- platform/javascript/api/javascript_singleton.h | 6 ++++-- platform/javascript/api/javascript_tools_editor_plugin.h | 6 ++++-- platform/javascript/audio_driver_javascript.h | 6 ++++-- platform/javascript/godot_audio.h | 6 ++++-- platform/javascript/godot_js.h | 6 ++++-- platform/javascript/os_javascript.h | 6 ++++-- platform/osx/crash_handler_osx.h | 6 ++++-- platform/osx/dir_access_osx.h | 6 ++++-- platform/osx/joypad_osx.h | 6 ++++-- platform/osx/os_osx.h | 6 ++++-- platform/osx/power_osx.h | 6 ++++-- platform/register_platform_apis.h | 6 ++++-- platform/server/os_server.h | 6 ++++-- platform/windows/context_gl_windows.h | 6 ++++-- platform/windows/crash_handler_windows.h | 6 ++++-- platform/windows/joypad_windows.h | 6 ++++-- platform/windows/key_mapping_windows.h | 6 ++++-- platform/windows/lang_table.h | 6 ++++-- platform/windows/os_windows.h | 6 ++++-- platform/windows/power_windows.h | 6 ++++-- platform/windows/windows_terminal_logger.h | 6 ++++-- platform/x11/context_gl_x11.h | 6 ++++-- platform/x11/crash_handler_x11.h | 6 ++++-- platform/x11/joypad_linux.h | 6 ++++-- platform/x11/key_mapping_x11.h | 6 ++++-- platform/x11/os_x11.h | 6 ++++-- platform/x11/power_x11.h | 6 ++++-- 51 files changed, 204 insertions(+), 102 deletions(-) diff --git a/platform/android/android_input_handler.h b/platform/android/android_input_handler.h index 3c0cf2170..6105a2b43 100644 --- a/platform/android/android_input_handler.h +++ b/platform/android/android_input_handler.h @@ -1,3 +1,5 @@ +#ifndef ANDROID_INPUT_HANDLER_H +#define ANDROID_INPUT_HANDLER_H /*************************************************************************/ /* android_input_handler.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef ANDROID_INPUT_HANDLER_H -#define ANDROID_INPUT_HANDLER_H + + #include "main/input_default.h" diff --git a/platform/android/android_keys_utils.h b/platform/android/android_keys_utils.h index ad3d96905..b82d99369 100644 --- a/platform/android/android_keys_utils.h +++ b/platform/android/android_keys_utils.h @@ -1,3 +1,5 @@ +#ifndef ANDROID_KEYS_UTILS_H +#define ANDROID_KEYS_UTILS_H /*************************************************************************/ /* android_keys_utils.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef ANDROID_KEYS_UTILS_H -#define ANDROID_KEYS_UTILS_H + + #include #include diff --git a/platform/android/api/api.h b/platform/android/api/api.h index a4ee27cf8..bd5893e62 100644 --- a/platform/android/api/api.h +++ b/platform/android/api/api.h @@ -1,3 +1,5 @@ +#ifndef ANDROID_API_H +#define ANDROID_API_H /*************************************************************************/ /* api.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef ANDROID_API_H -#define ANDROID_API_H + + void register_android_api(); void unregister_android_api(); diff --git a/platform/android/api/java_class_wrapper.h b/platform/android/api/java_class_wrapper.h index 56a5e9e71..d48b40ec5 100644 --- a/platform/android/api/java_class_wrapper.h +++ b/platform/android/api/java_class_wrapper.h @@ -1,3 +1,5 @@ +#ifndef JAVA_CLASS_WRAPPER_H +#define JAVA_CLASS_WRAPPER_H /*************************************************************************/ /* java_class_wrapper.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef JAVA_CLASS_WRAPPER_H -#define JAVA_CLASS_WRAPPER_H + + #include "core/reference.h" diff --git a/platform/android/api/jni_singleton.h b/platform/android/api/jni_singleton.h index 90b89c913..02f80a61a 100644 --- a/platform/android/api/jni_singleton.h +++ b/platform/android/api/jni_singleton.h @@ -1,3 +1,5 @@ +#ifndef JNI_SINGLETON_H +#define JNI_SINGLETON_H /*************************************************************************/ /* jni_singleton.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef JNI_SINGLETON_H -#define JNI_SINGLETON_H + + #include #include diff --git a/platform/android/audio_driver_opensl.h b/platform/android/audio_driver_opensl.h index 64c31684a..7274ee7e8 100644 --- a/platform/android/audio_driver_opensl.h +++ b/platform/android/audio_driver_opensl.h @@ -1,3 +1,5 @@ +#ifndef AUDIO_DRIVER_OPENSL_H +#define AUDIO_DRIVER_OPENSL_H /*************************************************************************/ /* audio_driver_opensl.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef AUDIO_DRIVER_OPENSL_H -#define AUDIO_DRIVER_OPENSL_H + + #include "core/os/mutex.h" #include "servers/audio_server.h" diff --git a/platform/android/dir_access_jandroid.h b/platform/android/dir_access_jandroid.h index 1f5782ed1..7df0a710d 100644 --- a/platform/android/dir_access_jandroid.h +++ b/platform/android/dir_access_jandroid.h @@ -1,3 +1,5 @@ +#ifndef DIR_ACCESS_JANDROID_H +#define DIR_ACCESS_JANDROID_H /*************************************************************************/ /* dir_access_jandroid.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef DIR_ACCESS_JANDROID_H -#define DIR_ACCESS_JANDROID_H + + #include "core/os/dir_access.h" #include "java_godot_lib_jni.h" diff --git a/platform/android/file_access_android.h b/platform/android/file_access_android.h index a04f4d668..20ff1af86 100644 --- a/platform/android/file_access_android.h +++ b/platform/android/file_access_android.h @@ -1,3 +1,5 @@ +#ifndef FILE_ACCESS_ANDROID_H +#define FILE_ACCESS_ANDROID_H /*************************************************************************/ /* file_access_android.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef FILE_ACCESS_ANDROID_H -#define FILE_ACCESS_ANDROID_H + + #include "core/os/file_access.h" #include diff --git a/platform/android/java_godot_io_wrapper.h b/platform/android/java_godot_io_wrapper.h index f21e78749..354de2d1a 100644 --- a/platform/android/java_godot_io_wrapper.h +++ b/platform/android/java_godot_io_wrapper.h @@ -1,3 +1,5 @@ +#ifndef JAVA_GODOT_IO_WRAPPER_H +#define JAVA_GODOT_IO_WRAPPER_H /*************************************************************************/ /* java_godot_io_wrapper.h */ /*************************************************************************/ @@ -31,8 +33,8 @@ // note, swapped java and godot around in the file name so all the java // wrappers are together -#ifndef JAVA_GODOT_IO_WRAPPER_H -#define JAVA_GODOT_IO_WRAPPER_H + + #include #include diff --git a/platform/android/java_godot_lib_jni.h b/platform/android/java_godot_lib_jni.h index de725bd56..4d48ec520 100644 --- a/platform/android/java_godot_lib_jni.h +++ b/platform/android/java_godot_lib_jni.h @@ -1,3 +1,5 @@ +#ifndef JAVA_GODOT_LIB_JNI_H +#define JAVA_GODOT_LIB_JNI_H /*************************************************************************/ /* java_godot_lib_jni.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef JAVA_GODOT_LIB_JNI_H -#define JAVA_GODOT_LIB_JNI_H + + #include #include diff --git a/platform/android/java_godot_wrapper.h b/platform/android/java_godot_wrapper.h index 47071300d..a23b77beb 100644 --- a/platform/android/java_godot_wrapper.h +++ b/platform/android/java_godot_wrapper.h @@ -1,3 +1,5 @@ +#ifndef JAVA_GODOT_WRAPPER_H +#define JAVA_GODOT_WRAPPER_H /*************************************************************************/ /* java_godot_wrapper.h */ /*************************************************************************/ @@ -31,8 +33,8 @@ // note, swapped java and godot around in the file name so all the java // wrappers are together -#ifndef JAVA_GODOT_WRAPPER_H -#define JAVA_GODOT_WRAPPER_H + + #include #include diff --git a/platform/android/jni_utils.h b/platform/android/jni_utils.h index c6a0191f5..404160ae1 100644 --- a/platform/android/jni_utils.h +++ b/platform/android/jni_utils.h @@ -1,3 +1,5 @@ +#ifndef JNI_UTILS_H +#define JNI_UTILS_H /*************************************************************************/ /* jni_utils.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef JNI_UTILS_H -#define JNI_UTILS_H + + #include "string_android.h" #include diff --git a/platform/android/net_socket_android.h b/platform/android/net_socket_android.h index d77952668..d250af91f 100644 --- a/platform/android/net_socket_android.h +++ b/platform/android/net_socket_android.h @@ -1,3 +1,5 @@ +#ifndef NET_SOCKET_ANDROID_H +#define NET_SOCKET_ANDROID_H /*************************************************************************/ /* net_socket_android.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef NET_SOCKET_ANDROID_H -#define NET_SOCKET_ANDROID_H + + #include "drivers/unix/net_socket_posix.h" diff --git a/platform/android/os_android.h b/platform/android/os_android.h index cd88f1a9c..18e29e38b 100644 --- a/platform/android/os_android.h +++ b/platform/android/os_android.h @@ -1,3 +1,5 @@ +#ifndef OS_ANDROID_H +#define OS_ANDROID_H /*************************************************************************/ /* os_android.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef OS_ANDROID_H -#define OS_ANDROID_H + + #include "audio_driver_opensl.h" #include "core/os/main_loop.h" diff --git a/platform/android/plugin/godot_plugin_jni.h b/platform/android/plugin/godot_plugin_jni.h index 35f9d5b51..86c838cbe 100644 --- a/platform/android/plugin/godot_plugin_jni.h +++ b/platform/android/plugin/godot_plugin_jni.h @@ -1,3 +1,5 @@ +#ifndef GODOT_PLUGIN_JNI_H +#define GODOT_PLUGIN_JNI_H /*************************************************************************/ /* godot_plugin_jni.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GODOT_PLUGIN_JNI_H -#define GODOT_PLUGIN_JNI_H + + #include #include diff --git a/platform/android/power_android.h b/platform/android/power_android.h index ed38408d7..200881e5d 100644 --- a/platform/android/power_android.h +++ b/platform/android/power_android.h @@ -1,3 +1,5 @@ +#ifndef POWER_ANDROID_H +#define POWER_ANDROID_H /*************************************************************************/ /* power_android.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef POWER_ANDROID_H -#define POWER_ANDROID_H + + #include "core/os/os.h" diff --git a/platform/android/string_android.h b/platform/android/string_android.h index ddcaa3413..bc4a56a68 100644 --- a/platform/android/string_android.h +++ b/platform/android/string_android.h @@ -1,3 +1,5 @@ +#ifndef STRING_ANDROID_H +#define STRING_ANDROID_H /*************************************************************************/ /* string_android.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef STRING_ANDROID_H -#define STRING_ANDROID_H + + #include "core/ustring.h" #include "thread_jandroid.h" #include diff --git a/platform/android/thread_jandroid.h b/platform/android/thread_jandroid.h index 2073423f8..a4e2e83ab 100644 --- a/platform/android/thread_jandroid.h +++ b/platform/android/thread_jandroid.h @@ -1,3 +1,5 @@ +#ifndef THREAD_JANDROID_H +#define THREAD_JANDROID_H /*************************************************************************/ /* thread_jandroid.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef THREAD_JANDROID_H -#define THREAD_JANDROID_H + + #include diff --git a/platform/iphone/api/api.h b/platform/iphone/api/api.h index ece91a9f1..61c4eb898 100644 --- a/platform/iphone/api/api.h +++ b/platform/iphone/api/api.h @@ -1,3 +1,5 @@ +#ifndef IPHONE_API_H +#define IPHONE_API_H /*************************************************************************/ /* api.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef IPHONE_API_H -#define IPHONE_API_H + + #if defined(IPHONE_ENABLED) extern void godot_ios_plugins_initialize(); diff --git a/platform/iphone/ios.h b/platform/iphone/ios.h index e926ec34b..bf52391fa 100644 --- a/platform/iphone/ios.h +++ b/platform/iphone/ios.h @@ -1,3 +1,5 @@ +#ifndef IOS_H +#define IOS_H /*************************************************************************/ /* ios.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef IOS_H -#define IOS_H + + #include "core/object.h" diff --git a/platform/iphone/os_iphone.h b/platform/iphone/os_iphone.h index c2fdd1bcd..645dc23f0 100644 --- a/platform/iphone/os_iphone.h +++ b/platform/iphone/os_iphone.h @@ -1,3 +1,5 @@ +#ifndef OS_IPHONE_H +#define OS_IPHONE_H /*************************************************************************/ /* os_iphone.h */ /*************************************************************************/ @@ -30,8 +32,8 @@ #ifdef IPHONE_ENABLED -#ifndef OS_IPHONE_H -#define OS_IPHONE_H + + #include "core/os/input.h" #include "drivers/coreaudio/audio_driver_coreaudio.h" diff --git a/platform/iphone/plugin/godot_plugin_config.h b/platform/iphone/plugin/godot_plugin_config.h index 35a942cf3..0d2c15ebf 100644 --- a/platform/iphone/plugin/godot_plugin_config.h +++ b/platform/iphone/plugin/godot_plugin_config.h @@ -1,3 +1,5 @@ +#ifndef GODOT_PLUGIN_CONFIG_H +#define GODOT_PLUGIN_CONFIG_H /*************************************************************************/ /* godot_plugin_config.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GODOT_PLUGIN_CONFIG_H -#define GODOT_PLUGIN_CONFIG_H + + #include "core/error_list.h" #include "core/io/config_file.h" diff --git a/platform/iphone/power_iphone.h b/platform/iphone/power_iphone.h index e0b9f6d3b..14b4957b6 100644 --- a/platform/iphone/power_iphone.h +++ b/platform/iphone/power_iphone.h @@ -1,3 +1,5 @@ +#ifndef POWER_IPHONE_H +#define POWER_IPHONE_H /*************************************************************************/ /* power_iphone.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef POWER_IPHONE_H -#define POWER_IPHONE_H + + #include diff --git a/platform/javascript/api/api.h b/platform/javascript/api/api.h index 97e06c857..cda69cac2 100644 --- a/platform/javascript/api/api.h +++ b/platform/javascript/api/api.h @@ -1,3 +1,5 @@ +#ifndef JAVASCRIPT_API_H +#define JAVASCRIPT_API_H /*************************************************************************/ /* api.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef JAVASCRIPT_API_H -#define JAVASCRIPT_API_H + + void register_javascript_api(); void unregister_javascript_api(); diff --git a/platform/javascript/api/javascript_singleton.h b/platform/javascript/api/javascript_singleton.h index d346a1ce9..76caa8dde 100644 --- a/platform/javascript/api/javascript_singleton.h +++ b/platform/javascript/api/javascript_singleton.h @@ -1,3 +1,5 @@ +#ifndef JAVASCRIPT_SINGLETON_H +#define JAVASCRIPT_SINGLETON_H /*************************************************************************/ /* javascript_singleton.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef JAVASCRIPT_SINGLETON_H -#define JAVASCRIPT_SINGLETON_H + + #include "core/object.h" #include "core/reference.h" diff --git a/platform/javascript/api/javascript_tools_editor_plugin.h b/platform/javascript/api/javascript_tools_editor_plugin.h index b24a82f9a..3216a8b8a 100644 --- a/platform/javascript/api/javascript_tools_editor_plugin.h +++ b/platform/javascript/api/javascript_tools_editor_plugin.h @@ -1,3 +1,5 @@ +#ifndef JAVASCRIPT_TOOLS_EDITOR_PLUGIN_H +#define JAVASCRIPT_TOOLS_EDITOR_PLUGIN_H /*************************************************************************/ /* javascript_tools_editor_plugin.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef JAVASCRIPT_TOOLS_EDITOR_PLUGIN_H -#define JAVASCRIPT_TOOLS_EDITOR_PLUGIN_H + + #if defined(TOOLS_ENABLED) && defined(JAVASCRIPT_ENABLED) #include "core/io/zip_io.h" diff --git a/platform/javascript/audio_driver_javascript.h b/platform/javascript/audio_driver_javascript.h index b7b0b3ac9..d659533da 100644 --- a/platform/javascript/audio_driver_javascript.h +++ b/platform/javascript/audio_driver_javascript.h @@ -1,3 +1,5 @@ +#ifndef AUDIO_DRIVER_JAVASCRIPT_H +#define AUDIO_DRIVER_JAVASCRIPT_H /*************************************************************************/ /* audio_driver_javascript.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef AUDIO_DRIVER_JAVASCRIPT_H -#define AUDIO_DRIVER_JAVASCRIPT_H + + #include "core/os/mutex.h" #include "core/os/thread.h" diff --git a/platform/javascript/godot_audio.h b/platform/javascript/godot_audio.h index 012f8daeb..21c32d8f9 100644 --- a/platform/javascript/godot_audio.h +++ b/platform/javascript/godot_audio.h @@ -1,3 +1,5 @@ +#ifndef GODOT_AUDIO_H +#define GODOT_AUDIO_H /*************************************************************************/ /* godot_audio.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GODOT_AUDIO_H -#define GODOT_AUDIO_H + + #ifdef __cplusplus extern "C" { diff --git a/platform/javascript/godot_js.h b/platform/javascript/godot_js.h index 2cb5c3025..e85963a27 100644 --- a/platform/javascript/godot_js.h +++ b/platform/javascript/godot_js.h @@ -1,3 +1,5 @@ +#ifndef GODOT_JS_H +#define GODOT_JS_H /*************************************************************************/ /* godot_js.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef GODOT_JS_H -#define GODOT_JS_H + + #ifdef __cplusplus extern "C" { diff --git a/platform/javascript/os_javascript.h b/platform/javascript/os_javascript.h index 50f0e8776..9581d3aa5 100644 --- a/platform/javascript/os_javascript.h +++ b/platform/javascript/os_javascript.h @@ -1,3 +1,5 @@ +#ifndef OS_JAVASCRIPT_H +#define OS_JAVASCRIPT_H /*************************************************************************/ /* os_javascript.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef OS_JAVASCRIPT_H -#define OS_JAVASCRIPT_H + + #include "audio_driver_javascript.h" #include "drivers/unix/os_unix.h" diff --git a/platform/osx/crash_handler_osx.h b/platform/osx/crash_handler_osx.h index 72938e5e0..32e43ac84 100644 --- a/platform/osx/crash_handler_osx.h +++ b/platform/osx/crash_handler_osx.h @@ -1,3 +1,5 @@ +#ifndef CRASH_HANDLER_OSX_H +#define CRASH_HANDLER_OSX_H /*************************************************************************/ /* crash_handler_osx.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef CRASH_HANDLER_OSX_H -#define CRASH_HANDLER_OSX_H + + class CrashHandler { bool disabled; diff --git a/platform/osx/dir_access_osx.h b/platform/osx/dir_access_osx.h index 4b43a9efe..cd0863156 100644 --- a/platform/osx/dir_access_osx.h +++ b/platform/osx/dir_access_osx.h @@ -1,3 +1,5 @@ +#ifndef DIR_ACCESS_OSX_H +#define DIR_ACCESS_OSX_H /*************************************************************************/ /* dir_access_osx.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef DIR_ACCESS_OSX_H -#define DIR_ACCESS_OSX_H + + #if defined(UNIX_ENABLED) || defined(LIBC_FILEIO_ENABLED) diff --git a/platform/osx/joypad_osx.h b/platform/osx/joypad_osx.h index f10ea96d9..10c33a975 100644 --- a/platform/osx/joypad_osx.h +++ b/platform/osx/joypad_osx.h @@ -1,3 +1,5 @@ +#ifndef JOYPADOSX_H +#define JOYPADOSX_H /*************************************************************************/ /* joypad_osx.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef JOYPADOSX_H -#define JOYPADOSX_H + + #ifdef MACOS_10_0_4 #include diff --git a/platform/osx/os_osx.h b/platform/osx/os_osx.h index 5b02153ce..55a28093f 100644 --- a/platform/osx/os_osx.h +++ b/platform/osx/os_osx.h @@ -1,3 +1,5 @@ +#ifndef OS_OSX_H +#define OS_OSX_H /*************************************************************************/ /* os_osx.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef OS_OSX_H -#define OS_OSX_H + + #define BitMap _QDBitMap // Suppress deprecated QuickDraw definition. diff --git a/platform/osx/power_osx.h b/platform/osx/power_osx.h index 22c7371fb..1da9e9139 100644 --- a/platform/osx/power_osx.h +++ b/platform/osx/power_osx.h @@ -1,3 +1,5 @@ +#ifndef POWER_OSX_H +#define POWER_OSX_H /*************************************************************************/ /* power_osx.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef POWER_OSX_H -#define POWER_OSX_H + + #include "core/os/file_access.h" #include "core/os/os.h" diff --git a/platform/register_platform_apis.h b/platform/register_platform_apis.h index 8b6d23a7a..7a8e384e6 100644 --- a/platform/register_platform_apis.h +++ b/platform/register_platform_apis.h @@ -1,3 +1,5 @@ +#ifndef REGISTER_APIS_H +#define REGISTER_APIS_H /*************************************************************************/ /* register_platform_apis.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef REGISTER_APIS_H -#define REGISTER_APIS_H + + void register_platform_apis(); void unregister_platform_apis(); diff --git a/platform/server/os_server.h b/platform/server/os_server.h index af03f898d..b1a03d2df 100644 --- a/platform/server/os_server.h +++ b/platform/server/os_server.h @@ -1,3 +1,5 @@ +#ifndef OS_SERVER_H +#define OS_SERVER_H /*************************************************************************/ /* os_server.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef OS_SERVER_H -#define OS_SERVER_H + + #include "drivers/dummy/texture_loader_dummy.h" #include "drivers/unix/os_unix.h" diff --git a/platform/windows/context_gl_windows.h b/platform/windows/context_gl_windows.h index 81fa17b05..d51b36c86 100644 --- a/platform/windows/context_gl_windows.h +++ b/platform/windows/context_gl_windows.h @@ -1,3 +1,5 @@ +#ifndef CONTEXT_GL_WIN_H +#define CONTEXT_GL_WIN_H /*************************************************************************/ /* context_gl_windows.h */ /*************************************************************************/ @@ -32,8 +34,8 @@ // Author: Juan Linietsky , (C) 2008 -#ifndef CONTEXT_GL_WIN_H -#define CONTEXT_GL_WIN_H + + #include "core/error_list.h" #include "core/os/os.h" diff --git a/platform/windows/crash_handler_windows.h b/platform/windows/crash_handler_windows.h index ec8de3ffa..2a69e7e54 100644 --- a/platform/windows/crash_handler_windows.h +++ b/platform/windows/crash_handler_windows.h @@ -1,3 +1,5 @@ +#ifndef CRASH_HANDLER_WINDOWS_H +#define CRASH_HANDLER_WINDOWS_H /*************************************************************************/ /* crash_handler_windows.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef CRASH_HANDLER_WINDOWS_H -#define CRASH_HANDLER_WINDOWS_H + + #define WIN32_LEAN_AND_MEAN #include diff --git a/platform/windows/joypad_windows.h b/platform/windows/joypad_windows.h index 4be9cc38e..650e48980 100644 --- a/platform/windows/joypad_windows.h +++ b/platform/windows/joypad_windows.h @@ -1,3 +1,5 @@ +#ifndef JOYPAD_WINDOWS_H +#define JOYPAD_WINDOWS_H /*************************************************************************/ /* joypad_windows.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef JOYPAD_WINDOWS_H -#define JOYPAD_WINDOWS_H + + #include "os_windows.h" diff --git a/platform/windows/key_mapping_windows.h b/platform/windows/key_mapping_windows.h index 76f3c90ab..f4cedd148 100644 --- a/platform/windows/key_mapping_windows.h +++ b/platform/windows/key_mapping_windows.h @@ -1,3 +1,5 @@ +#ifndef KEY_MAPPING_WINDOWS_H +#define KEY_MAPPING_WINDOWS_H /*************************************************************************/ /* key_mapping_windows.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef KEY_MAPPING_WINDOWS_H -#define KEY_MAPPING_WINDOWS_H + + #include "core/os/keyboard.h" diff --git a/platform/windows/lang_table.h b/platform/windows/lang_table.h index 5b022853e..d16bcb0ff 100644 --- a/platform/windows/lang_table.h +++ b/platform/windows/lang_table.h @@ -1,3 +1,5 @@ +#ifndef LANG_TABLE_H +#define LANG_TABLE_H /*************************************************************************/ /* lang_table.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef LANG_TABLE_H -#define LANG_TABLE_H + + //#include diff --git a/platform/windows/os_windows.h b/platform/windows/os_windows.h index 56d5f8b3d..379b5506f 100644 --- a/platform/windows/os_windows.h +++ b/platform/windows/os_windows.h @@ -1,3 +1,5 @@ +#ifndef OS_WINDOWS_H +#define OS_WINDOWS_H /*************************************************************************/ /* os_windows.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef OS_WINDOWS_H -#define OS_WINDOWS_H + + #include "context_gl_windows.h" #include "core/os/input.h" diff --git a/platform/windows/power_windows.h b/platform/windows/power_windows.h index 624bfbe09..e428f9149 100644 --- a/platform/windows/power_windows.h +++ b/platform/windows/power_windows.h @@ -1,3 +1,5 @@ +#ifndef POWER_WINDOWS_H +#define POWER_WINDOWS_H /*************************************************************************/ /* power_windows.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef POWER_WINDOWS_H -#define POWER_WINDOWS_H + + #include "core/os/dir_access.h" #include "core/os/file_access.h" diff --git a/platform/windows/windows_terminal_logger.h b/platform/windows/windows_terminal_logger.h index 9d4f13dd0..b41a3a6ea 100644 --- a/platform/windows/windows_terminal_logger.h +++ b/platform/windows/windows_terminal_logger.h @@ -1,3 +1,5 @@ +#ifndef WINDOWS_TERMINAL_LOGGER_H +#define WINDOWS_TERMINAL_LOGGER_H /*************************************************************************/ /* windows_terminal_logger.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef WINDOWS_TERMINAL_LOGGER_H -#define WINDOWS_TERMINAL_LOGGER_H + + #ifdef WINDOWS_ENABLED diff --git a/platform/x11/context_gl_x11.h b/platform/x11/context_gl_x11.h index 9f2f20744..e8e19997e 100644 --- a/platform/x11/context_gl_x11.h +++ b/platform/x11/context_gl_x11.h @@ -1,3 +1,5 @@ +#ifndef CONTEXT_GL_X11_H +#define CONTEXT_GL_X11_H /*************************************************************************/ /* context_gl_x11.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef CONTEXT_GL_X11_H -#define CONTEXT_GL_X11_H + + #ifdef X11_ENABLED diff --git a/platform/x11/crash_handler_x11.h b/platform/x11/crash_handler_x11.h index 944a8bfb6..5dedf9b2f 100644 --- a/platform/x11/crash_handler_x11.h +++ b/platform/x11/crash_handler_x11.h @@ -1,3 +1,5 @@ +#ifndef CRASH_HANDLER_X11_H +#define CRASH_HANDLER_X11_H /*************************************************************************/ /* crash_handler_x11.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef CRASH_HANDLER_X11_H -#define CRASH_HANDLER_X11_H + + class CrashHandler { bool disabled; diff --git a/platform/x11/joypad_linux.h b/platform/x11/joypad_linux.h index 13fbeeba8..ffe02cdcc 100644 --- a/platform/x11/joypad_linux.h +++ b/platform/x11/joypad_linux.h @@ -1,3 +1,5 @@ +#ifndef JOYPAD_LINUX_H +#define JOYPAD_LINUX_H /*************************************************************************/ /* joypad_linux.h */ /*************************************************************************/ @@ -29,8 +31,8 @@ /*************************************************************************/ //author: Andreas Haas -#ifndef JOYPAD_LINUX_H -#define JOYPAD_LINUX_H + + #ifdef JOYDEV_ENABLED #include "core/os/mutex.h" diff --git a/platform/x11/key_mapping_x11.h b/platform/x11/key_mapping_x11.h index 7769d85c4..6ae612c09 100644 --- a/platform/x11/key_mapping_x11.h +++ b/platform/x11/key_mapping_x11.h @@ -1,3 +1,5 @@ +#ifndef KEY_MAPPING_X11_H +#define KEY_MAPPING_X11_H /*************************************************************************/ /* key_mapping_x11.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef KEY_MAPPING_X11_H -#define KEY_MAPPING_X11_H + + #include #include diff --git a/platform/x11/os_x11.h b/platform/x11/os_x11.h index bed559030..1f2b9c6a3 100644 --- a/platform/x11/os_x11.h +++ b/platform/x11/os_x11.h @@ -1,3 +1,5 @@ +#ifndef OS_X11_H +#define OS_X11_H /*************************************************************************/ /* os_x11.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef OS_X11_H -#define OS_X11_H + + #include "context_gl_x11.h" #include "core/local_vector.h" diff --git a/platform/x11/power_x11.h b/platform/x11/power_x11.h index 55b944566..1994d5308 100644 --- a/platform/x11/power_x11.h +++ b/platform/x11/power_x11.h @@ -1,3 +1,5 @@ +#ifndef POWER_X11_H +#define POWER_X11_H /*************************************************************************/ /* power_x11.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef POWER_X11_H -#define POWER_X11_H + + #include "core/os/dir_access.h" #include "core/os/file_access.h"