Nixyri/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2024-11-21 19:42:43 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #41731 from madmiraal/fix-header-guards

Browse Source 
Ensure header guards enclose entire header.
This commit is contained in:
Rémi Verschelde 2020-09-03 13:18:27 +02:00 committed by GitHub
commit 315ee66f4e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/io/file_access_zip.h
View File

@ -28,11 +28,11 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifdef MINIZIP_ENABLED
#ifndef FILE_ACCESS_ZIP_H
#define FILE_ACCESS_ZIP_H
#ifdef MINIZIP_ENABLED
#include "core/io/file_access_pack.h"
#include "core/map.h"
@ -113,6 +113,6 @@ public:
~FileAccessZip();
};
#endif // FILE_ACCESS_ZIP_H
#endif // MINIZIP_ENABLED
#endif // FILE_ACCESS_ZIP_H

8
drivers/alsa/audio_driver_alsa.h
View File

@ -28,11 +28,11 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifdef ALSA_ENABLED
#ifndef AUDIO_DRIVER_ALSA_H
#define AUDIO_DRIVER_ALSA_H
#ifdef ALSA_ENABLED
#include "core/os/mutex.h"
#include "core/os/thread.h"
#include "servers/audio_server.h"
@ -88,6 +88,6 @@ public:
~AudioDriverALSA() {}
};
#endif // AUDIO_DRIVER_ALSA_H
#endif // ALSA_ENABLED
#endif // AUDIO_DRIVER_ALSA_H

7
drivers/alsamidi/midi_driver_alsamidi.h
View File

@ -28,11 +28,11 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifdef ALSAMIDI_ENABLED
#ifndef MIDI_DRIVER_ALSAMIDI_H
#define MIDI_DRIVER_ALSAMIDI_H
#ifdef ALSAMIDI_ENABLED
#include "core/os/midi_driver.h"
#include "core/os/mutex.h"
#include "core/os/thread.h"
@ -64,5 +64,6 @@ public:
virtual ~MIDIDriverALSAMidi();
};
#endif // MIDI_DRIVER_ALSAMIDI_H
#endif // ALSAMIDI_ENABLED
#endif // MIDI_DRIVER_ALSAMIDI_H

8
drivers/pulseaudio/audio_driver_pulseaudio.h
View File

@ -28,11 +28,11 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifdef PULSEAUDIO_ENABLED
#ifndef AUDIO_DRIVER_PULSEAUDIO_H
#define AUDIO_DRIVER_PULSEAUDIO_H
#ifdef PULSEAUDIO_ENABLED
#include "core/os/mutex.h"
#include "core/os/thread.h"
#include "servers/audio_server.h"
@ -124,6 +124,6 @@ public:
~AudioDriverPulseAudio() {}
};
#endif // AUDIO_DRIVER_PULSEAUDIO_H
#endif // PULSEAUDIO_ENABLED
#endif // AUDIO_DRIVER_PULSEAUDIO_H

8
modules/cvtt/register_types.h
View File

@ -28,14 +28,14 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifdef TOOLS_ENABLED
#ifndef CVTT_REGISTER_TYPES_H
#define CVTT_REGISTER_TYPES_H
#ifdef TOOLS_ENABLED
void register_cvtt_types();
void unregister_cvtt_types();
#endif // CVTT_REGISTER_TYPES_H
#endif // TOOLS_ENABLED
#endif // CVTT_REGISTER_TYPES_H

8
modules/webrtc/webrtc_data_channel_gdnative.h
View File

@ -28,11 +28,11 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifdef WEBRTC_GDNATIVE_ENABLED
#ifndef WEBRTC_DATA_CHANNEL_GDNATIVE_H
#define WEBRTC_DATA_CHANNEL_GDNATIVE_H
#ifdef WEBRTC_GDNATIVE_ENABLED
#include "modules/gdnative/include/net/godot_net.h"
#include "webrtc_data_channel.h"
@ -75,6 +75,6 @@ public:
~WebRTCDataChannelGDNative();
};
#endif // WEBRTC_DATA_CHANNEL_GDNATIVE_H
#endif // WEBRTC_GDNATIVE_ENABLED
#endif // WEBRTC_DATA_CHANNEL_GDNATIVE_H

8
modules/webrtc/webrtc_peer_connection_gdnative.h
View File

@ -28,11 +28,11 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifdef WEBRTC_GDNATIVE_ENABLED
#ifndef WEBRTC_PEER_CONNECTION_GDNATIVE_H
#define WEBRTC_PEER_CONNECTION_GDNATIVE_H
#ifdef WEBRTC_GDNATIVE_ENABLED
#include "modules/gdnative/include/net/godot_net.h"
#include "webrtc_peer_connection.h"
@ -68,6 +68,6 @@ public:
~WebRTCPeerConnectionGDNative();
};
#endif // WEBRTC_PEER_CONNECTION_GDNATIVE_H
#endif // WEBRTC_GDNATIVE_ENABLED
#endif // WEBRTC_PEER_CONNECTION_GDNATIVE_H