diff --git a/drivers/alsa/audio_driver_alsa.h b/drivers/alsa/audio_driver_alsa.h index e61fe6f1b..59b89b801 100644 --- a/drivers/alsa/audio_driver_alsa.h +++ b/drivers/alsa/audio_driver_alsa.h @@ -1,3 +1,5 @@ +#ifndef AUDIO_DRIVER_ALSA_H +#define AUDIO_DRIVER_ALSA_H /*************************************************************************/ /* audio_driver_alsa.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef AUDIO_DRIVER_ALSA_H -#define AUDIO_DRIVER_ALSA_H + + #ifdef ALSA_ENABLED diff --git a/drivers/alsamidi/midi_driver_alsamidi.h b/drivers/alsamidi/midi_driver_alsamidi.h index dada62a10..8edb15230 100644 --- a/drivers/alsamidi/midi_driver_alsamidi.h +++ b/drivers/alsamidi/midi_driver_alsamidi.h @@ -1,3 +1,5 @@ +#ifndef MIDI_DRIVER_ALSAMIDI_H +#define MIDI_DRIVER_ALSAMIDI_H /*************************************************************************/ /* midi_driver_alsamidi.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef MIDI_DRIVER_ALSAMIDI_H -#define MIDI_DRIVER_ALSAMIDI_H + + #ifdef ALSAMIDI_ENABLED diff --git a/drivers/coreaudio/audio_driver_coreaudio.h b/drivers/coreaudio/audio_driver_coreaudio.h index fece0c3ed..306ceffed 100644 --- a/drivers/coreaudio/audio_driver_coreaudio.h +++ b/drivers/coreaudio/audio_driver_coreaudio.h @@ -1,3 +1,5 @@ +#ifndef AUDIO_DRIVER_COREAUDIO_H +#define AUDIO_DRIVER_COREAUDIO_H /*************************************************************************/ /* audio_driver_coreaudio.h */ /*************************************************************************/ @@ -30,8 +32,8 @@ #ifdef COREAUDIO_ENABLED -#ifndef AUDIO_DRIVER_COREAUDIO_H -#define AUDIO_DRIVER_COREAUDIO_H + + #include "servers/audio_server.h" diff --git a/drivers/coremidi/midi_driver_coremidi.h b/drivers/coremidi/midi_driver_coremidi.h index f6a66dbfa..d6a0c7c4e 100644 --- a/drivers/coremidi/midi_driver_coremidi.h +++ b/drivers/coremidi/midi_driver_coremidi.h @@ -1,3 +1,5 @@ +#ifndef MIDI_DRIVER_COREMIDI_H +#define MIDI_DRIVER_COREMIDI_H /*************************************************************************/ /* midi_driver_coremidi.h */ /*************************************************************************/ @@ -30,8 +32,8 @@ #ifdef COREMIDI_ENABLED -#ifndef MIDI_DRIVER_COREMIDI_H -#define MIDI_DRIVER_COREMIDI_H + + #include "core/os/midi_driver.h" #include "core/vector.h" diff --git a/drivers/dummy/rasterizer_dummy.h b/drivers/dummy/rasterizer_dummy.h index 9780edd1c..1022450cc 100644 --- a/drivers/dummy/rasterizer_dummy.h +++ b/drivers/dummy/rasterizer_dummy.h @@ -1,3 +1,5 @@ +#ifndef RASTERIZER_DUMMY_H +#define RASTERIZER_DUMMY_H /*************************************************************************/ /* rasterizer_dummy.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef RASTERIZER_DUMMY_H -#define RASTERIZER_DUMMY_H + + #include "core/math/camera_matrix.h" #include "core/self_list.h" diff --git a/drivers/dummy/texture_loader_dummy.h b/drivers/dummy/texture_loader_dummy.h index baa83f245..6ef0941cb 100644 --- a/drivers/dummy/texture_loader_dummy.h +++ b/drivers/dummy/texture_loader_dummy.h @@ -1,3 +1,5 @@ +#ifndef TEXTURE_LOADER_DUMMY_H +#define TEXTURE_LOADER_DUMMY_H /*************************************************************************/ /* texture_loader_dummy.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef TEXTURE_LOADER_DUMMY_H -#define TEXTURE_LOADER_DUMMY_H + + #include "core/io/resource_loader.h" #include "scene/resources/texture.h" diff --git a/drivers/gles2/rasterizer_canvas_base_gles2.h b/drivers/gles2/rasterizer_canvas_base_gles2.h index d721d94cd..82acc5526 100644 --- a/drivers/gles2/rasterizer_canvas_base_gles2.h +++ b/drivers/gles2/rasterizer_canvas_base_gles2.h @@ -1,3 +1,5 @@ +#ifndef RASTERIZERCANVASBASEGLES2_H +#define RASTERIZERCANVASBASEGLES2_H /*************************************************************************/ /* rasterizer_canvas_base_gles2.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef RASTERIZERCANVASBASEGLES2_H -#define RASTERIZERCANVASBASEGLES2_H + + #include "drivers/gles_common/rasterizer_array.h" #include "rasterizer_storage_gles2.h" diff --git a/drivers/gles2/rasterizer_canvas_gles2.h b/drivers/gles2/rasterizer_canvas_gles2.h index 8f0c8374a..9f6024261 100644 --- a/drivers/gles2/rasterizer_canvas_gles2.h +++ b/drivers/gles2/rasterizer_canvas_gles2.h @@ -1,3 +1,5 @@ +#ifndef RASTERIZERCANVASGLES2_H +#define RASTERIZERCANVASGLES2_H /*************************************************************************/ /* rasterizer_canvas_gles2.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef RASTERIZERCANVASGLES2_H -#define RASTERIZERCANVASGLES2_H + + #include "drivers/gles_common/rasterizer_canvas_batcher.h" #include "rasterizer_canvas_base_gles2.h" diff --git a/drivers/gles2/rasterizer_gles2.h b/drivers/gles2/rasterizer_gles2.h index bb2dc2b91..21c456875 100644 --- a/drivers/gles2/rasterizer_gles2.h +++ b/drivers/gles2/rasterizer_gles2.h @@ -1,3 +1,5 @@ +#ifndef RASTERIZERGLES2_H +#define RASTERIZERGLES2_H /*************************************************************************/ /* rasterizer_gles2.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef RASTERIZERGLES2_H -#define RASTERIZERGLES2_H + + #include "rasterizer_canvas_gles2.h" #include "rasterizer_scene_gles2.h" diff --git a/drivers/gles2/rasterizer_scene_gles2.h b/drivers/gles2/rasterizer_scene_gles2.h index 230c4e4f8..d0d1d7cb9 100644 --- a/drivers/gles2/rasterizer_scene_gles2.h +++ b/drivers/gles2/rasterizer_scene_gles2.h @@ -1,3 +1,5 @@ +#ifndef RASTERIZERSCENEGLES2_H +#define RASTERIZERSCENEGLES2_H /*************************************************************************/ /* rasterizer_scene_gles2.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef RASTERIZERSCENEGLES2_H -#define RASTERIZERSCENEGLES2_H + + /* Must come before shaders or the Windows build fails... */ #include "rasterizer_storage_gles2.h" diff --git a/drivers/gles2/rasterizer_storage_gles2.h b/drivers/gles2/rasterizer_storage_gles2.h index c1046a755..553f189f5 100644 --- a/drivers/gles2/rasterizer_storage_gles2.h +++ b/drivers/gles2/rasterizer_storage_gles2.h @@ -1,3 +1,5 @@ +#ifndef RASTERIZERSTORAGEGLES2_H +#define RASTERIZERSTORAGEGLES2_H /*************************************************************************/ /* rasterizer_storage_gles2.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef RASTERIZERSTORAGEGLES2_H -#define RASTERIZERSTORAGEGLES2_H + + #include "core/pool_vector.h" #include "core/self_list.h" diff --git a/drivers/gles2/shader_compiler_gles2.h b/drivers/gles2/shader_compiler_gles2.h index 7b81eb1c0..51a16eb0c 100644 --- a/drivers/gles2/shader_compiler_gles2.h +++ b/drivers/gles2/shader_compiler_gles2.h @@ -1,3 +1,5 @@ +#ifndef SHADERCOMPILERGLES2_H +#define SHADERCOMPILERGLES2_H /*************************************************************************/ /* shader_compiler_gles2.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef SHADERCOMPILERGLES2_H -#define SHADERCOMPILERGLES2_H + + #include "core/pair.h" #include "core/string_builder.h" diff --git a/drivers/gles2/shader_gles2.h b/drivers/gles2/shader_gles2.h index 791993a63..3203b9211 100644 --- a/drivers/gles2/shader_gles2.h +++ b/drivers/gles2/shader_gles2.h @@ -1,3 +1,5 @@ +#ifndef SHADER_GLES2_H +#define SHADER_GLES2_H /*************************************************************************/ /* shader_gles2.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef SHADER_GLES2_H -#define SHADER_GLES2_H + + // This must come first to avoid windows.h mess #include "platform_config.h" diff --git a/drivers/gles_common/rasterizer_array.h b/drivers/gles_common/rasterizer_array.h index 796d38902..3a280aa74 100644 --- a/drivers/gles_common/rasterizer_array.h +++ b/drivers/gles_common/rasterizer_array.h @@ -1,3 +1,5 @@ +#ifndef RASTERIZER_ARRAY_H +#define RASTERIZER_ARRAY_H /*************************************************************************/ /* rasterizer_array.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef RASTERIZER_ARRAY_H -#define RASTERIZER_ARRAY_H + + /** * Fast single-threaded growable array for POD types. diff --git a/drivers/gles_common/rasterizer_asserts.h b/drivers/gles_common/rasterizer_asserts.h index b39357bff..6b6e3e901 100644 --- a/drivers/gles_common/rasterizer_asserts.h +++ b/drivers/gles_common/rasterizer_asserts.h @@ -1,3 +1,5 @@ +#ifndef RASTERIZER_ASSERTS_H +#define RASTERIZER_ASSERTS_H /*************************************************************************/ /* rasterizer_asserts.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef RASTERIZER_ASSERTS_H -#define RASTERIZER_ASSERTS_H + + // For flow control checking, we want an easy way to apply asserts that occur in debug development builds only. // This is enforced by outputting a warning which will fail CI checks if the define is set in a PR. diff --git a/drivers/gles_common/rasterizer_canvas_batcher.h b/drivers/gles_common/rasterizer_canvas_batcher.h index 148056e68..2549706ca 100644 --- a/drivers/gles_common/rasterizer_canvas_batcher.h +++ b/drivers/gles_common/rasterizer_canvas_batcher.h @@ -1,3 +1,5 @@ +#ifndef RASTERIZER_CANVAS_BATCHER_H +#define RASTERIZER_CANVAS_BATCHER_H /*************************************************************************/ /* rasterizer_canvas_batcher.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef RASTERIZER_CANVAS_BATCHER_H -#define RASTERIZER_CANVAS_BATCHER_H + + #include "core/os/os.h" #include "core/project_settings.h" diff --git a/drivers/gles_common/rasterizer_storage_common.h b/drivers/gles_common/rasterizer_storage_common.h index 8e52afede..9abfaec47 100644 --- a/drivers/gles_common/rasterizer_storage_common.h +++ b/drivers/gles_common/rasterizer_storage_common.h @@ -1,3 +1,5 @@ +#ifndef RASTERIZER_STORAGE_COMMON_H +#define RASTERIZER_STORAGE_COMMON_H /*************************************************************************/ /* rasterizer_storage_common.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef RASTERIZER_STORAGE_COMMON_H -#define RASTERIZER_STORAGE_COMMON_H + + class RasterizerStorageCommon { public: diff --git a/drivers/png/image_loader_png.h b/drivers/png/image_loader_png.h index 54b1f1520..323a34028 100644 --- a/drivers/png/image_loader_png.h +++ b/drivers/png/image_loader_png.h @@ -1,3 +1,5 @@ +#ifndef IMAGE_LOADER_PNG_H +#define IMAGE_LOADER_PNG_H /*************************************************************************/ /* image_loader_png.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef IMAGE_LOADER_PNG_H -#define IMAGE_LOADER_PNG_H + + #include "core/io/image_loader.h" diff --git a/drivers/png/png_driver_common.h b/drivers/png/png_driver_common.h index fda79be6f..e509f7e50 100644 --- a/drivers/png/png_driver_common.h +++ b/drivers/png/png_driver_common.h @@ -1,3 +1,5 @@ +#ifndef PNG_DRIVER_COMMON_H +#define PNG_DRIVER_COMMON_H /*************************************************************************/ /* png_driver_common.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef PNG_DRIVER_COMMON_H -#define PNG_DRIVER_COMMON_H + + #include "core/image.h" #include "core/pool_vector.h" diff --git a/drivers/png/resource_saver_png.h b/drivers/png/resource_saver_png.h index 2529c8909..b6a0bd3fc 100644 --- a/drivers/png/resource_saver_png.h +++ b/drivers/png/resource_saver_png.h @@ -1,3 +1,5 @@ +#ifndef RESOURCE_SAVER_PNG_H +#define RESOURCE_SAVER_PNG_H /*************************************************************************/ /* resource_saver_png.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef RESOURCE_SAVER_PNG_H -#define RESOURCE_SAVER_PNG_H + + #include "core/image.h" #include "core/io/resource_saver.h" diff --git a/drivers/pulseaudio/audio_driver_pulseaudio.h b/drivers/pulseaudio/audio_driver_pulseaudio.h index 125dd34b9..b0a7525a2 100644 --- a/drivers/pulseaudio/audio_driver_pulseaudio.h +++ b/drivers/pulseaudio/audio_driver_pulseaudio.h @@ -1,3 +1,5 @@ +#ifndef AUDIO_DRIVER_PULSEAUDIO_H +#define AUDIO_DRIVER_PULSEAUDIO_H /*************************************************************************/ /* audio_driver_pulseaudio.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef AUDIO_DRIVER_PULSEAUDIO_H -#define AUDIO_DRIVER_PULSEAUDIO_H + + #ifdef PULSEAUDIO_ENABLED diff --git a/drivers/register_driver_types.h b/drivers/register_driver_types.h index c008d9318..25daee6e3 100644 --- a/drivers/register_driver_types.h +++ b/drivers/register_driver_types.h @@ -1,3 +1,5 @@ +#ifndef REGISTER_DRIVER_TYPES_H +#define REGISTER_DRIVER_TYPES_H /*************************************************************************/ /* register_driver_types.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef REGISTER_DRIVER_TYPES_H -#define REGISTER_DRIVER_TYPES_H + + void register_core_driver_types(); void unregister_core_driver_types(); diff --git a/drivers/unix/dir_access_unix.h b/drivers/unix/dir_access_unix.h index af20960de..acd7b573c 100644 --- a/drivers/unix/dir_access_unix.h +++ b/drivers/unix/dir_access_unix.h @@ -1,3 +1,5 @@ +#ifndef DIR_ACCESS_UNIX_H +#define DIR_ACCESS_UNIX_H /*************************************************************************/ /* dir_access_unix.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef DIR_ACCESS_UNIX_H -#define DIR_ACCESS_UNIX_H + + #if defined(UNIX_ENABLED) || defined(LIBC_FILEIO_ENABLED) diff --git a/drivers/unix/file_access_unix.h b/drivers/unix/file_access_unix.h index 36afde714..c34d9c76c 100644 --- a/drivers/unix/file_access_unix.h +++ b/drivers/unix/file_access_unix.h @@ -1,3 +1,5 @@ +#ifndef FILE_ACCESS_UNIX_H +#define FILE_ACCESS_UNIX_H /*************************************************************************/ /* file_access_unix.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef FILE_ACCESS_UNIX_H -#define FILE_ACCESS_UNIX_H + + #include "core/os/file_access.h" #include "core/os/memory.h" diff --git a/drivers/unix/ip_unix.h b/drivers/unix/ip_unix.h index 54e5ceb61..eee8b87ea 100644 --- a/drivers/unix/ip_unix.h +++ b/drivers/unix/ip_unix.h @@ -1,3 +1,5 @@ +#ifndef IP_UNIX_H +#define IP_UNIX_H /*************************************************************************/ /* ip_unix.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef IP_UNIX_H -#define IP_UNIX_H + + #include "core/io/ip.h" diff --git a/drivers/unix/net_socket_posix.h b/drivers/unix/net_socket_posix.h index fafab8ef4..13db5ab09 100644 --- a/drivers/unix/net_socket_posix.h +++ b/drivers/unix/net_socket_posix.h @@ -1,3 +1,5 @@ +#ifndef NET_SOCKET_UNIX_H +#define NET_SOCKET_UNIX_H /*************************************************************************/ /* net_socket_posix.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef NET_SOCKET_UNIX_H -#define NET_SOCKET_UNIX_H + + #include "core/io/net_socket.h" diff --git a/drivers/unix/os_unix.h b/drivers/unix/os_unix.h index 97381cbec..13cb29f0f 100644 --- a/drivers/unix/os_unix.h +++ b/drivers/unix/os_unix.h @@ -1,3 +1,5 @@ +#ifndef OS_UNIX_H +#define OS_UNIX_H /*************************************************************************/ /* os_unix.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef OS_UNIX_H -#define OS_UNIX_H + + #ifdef UNIX_ENABLED diff --git a/drivers/unix/syslog_logger.h b/drivers/unix/syslog_logger.h index 697a96a6f..3ce45ad25 100644 --- a/drivers/unix/syslog_logger.h +++ b/drivers/unix/syslog_logger.h @@ -1,3 +1,5 @@ +#ifndef SYSLOG_LOGGER_H +#define SYSLOG_LOGGER_H /*************************************************************************/ /* syslog_logger.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef SYSLOG_LOGGER_H -#define SYSLOG_LOGGER_H + + #ifdef UNIX_ENABLED diff --git a/drivers/unix/thread_posix.h b/drivers/unix/thread_posix.h index 9cd3ecbe9..cf03b3b95 100644 --- a/drivers/unix/thread_posix.h +++ b/drivers/unix/thread_posix.h @@ -1,3 +1,5 @@ +#ifndef THREAD_POSIX_H +#define THREAD_POSIX_H /*************************************************************************/ /* thread_posix.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef THREAD_POSIX_H -#define THREAD_POSIX_H + + #if !defined(NO_THREADS) void init_thread_posix(); diff --git a/drivers/wasapi/audio_driver_wasapi.h b/drivers/wasapi/audio_driver_wasapi.h index b2e98eefa..a0f2582be 100644 --- a/drivers/wasapi/audio_driver_wasapi.h +++ b/drivers/wasapi/audio_driver_wasapi.h @@ -1,3 +1,5 @@ +#ifndef AUDIO_DRIVER_WASAPI_H +#define AUDIO_DRIVER_WASAPI_H /*************************************************************************/ /* audio_driver_wasapi.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef AUDIO_DRIVER_WASAPI_H -#define AUDIO_DRIVER_WASAPI_H + + #ifdef WASAPI_ENABLED diff --git a/drivers/windows/dir_access_windows.h b/drivers/windows/dir_access_windows.h index 2647ffb01..c9d570351 100644 --- a/drivers/windows/dir_access_windows.h +++ b/drivers/windows/dir_access_windows.h @@ -1,3 +1,5 @@ +#ifndef DIR_ACCESS_WINDOWS_H +#define DIR_ACCESS_WINDOWS_H /*************************************************************************/ /* dir_access_windows.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef DIR_ACCESS_WINDOWS_H -#define DIR_ACCESS_WINDOWS_H + + #ifdef WINDOWS_ENABLED diff --git a/drivers/windows/file_access_windows.h b/drivers/windows/file_access_windows.h index a587a1b10..cf5530479 100644 --- a/drivers/windows/file_access_windows.h +++ b/drivers/windows/file_access_windows.h @@ -1,3 +1,5 @@ +#ifndef FILE_ACCESS_WINDOWS_H +#define FILE_ACCESS_WINDOWS_H /*************************************************************************/ /* file_access_windows.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef FILE_ACCESS_WINDOWS_H -#define FILE_ACCESS_WINDOWS_H + + #ifdef WINDOWS_ENABLED diff --git a/drivers/winmidi/midi_driver_winmidi.h b/drivers/winmidi/midi_driver_winmidi.h index 413b8e61d..e8111a96d 100644 --- a/drivers/winmidi/midi_driver_winmidi.h +++ b/drivers/winmidi/midi_driver_winmidi.h @@ -1,3 +1,5 @@ +#ifndef MIDI_DRIVER_WINMIDI_H +#define MIDI_DRIVER_WINMIDI_H /*************************************************************************/ /* midi_driver_winmidi.h */ /*************************************************************************/ @@ -30,8 +32,8 @@ #ifdef WINMIDI_ENABLED -#ifndef MIDI_DRIVER_WINMIDI_H -#define MIDI_DRIVER_WINMIDI_H + + #include "core/os/midi_driver.h" #include "core/vector.h" diff --git a/drivers/xaudio2/audio_driver_xaudio2.h b/drivers/xaudio2/audio_driver_xaudio2.h index 79cfce38e..328f09396 100644 --- a/drivers/xaudio2/audio_driver_xaudio2.h +++ b/drivers/xaudio2/audio_driver_xaudio2.h @@ -1,3 +1,5 @@ +#ifndef AUDIO_DRIVER_XAUDIO2_H +#define AUDIO_DRIVER_XAUDIO2_H /*************************************************************************/ /* audio_driver_xaudio2.h */ /*************************************************************************/ @@ -28,8 +30,8 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ -#ifndef AUDIO_DRIVER_XAUDIO2_H -#define AUDIO_DRIVER_XAUDIO2_H + + #include "core/os/mutex.h" #include "core/os/thread.h"