Ensure header guards enclose entire header.

(cherry picked from commit f6ad1954f7)
This commit is contained in:
Marcel Admiraal
2020-09-03 11:28:55 +01:00
committed by Rémi Verschelde
parent ee97e45a69
commit c6cccdf0c6
7 changed files with 28 additions and 27 deletions

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"
@ -89,6 +89,6 @@ public:
~AudioDriverALSA();
};
#endif // AUDIO_DRIVER_ALSA_H
#endif // ALSA_ENABLED
#endif // AUDIO_DRIVER_ALSA_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"
@ -65,5 +65,6 @@ public:
virtual ~MIDIDriverALSAMidi();
};
#endif // MIDI_DRIVER_ALSAMIDI_H
#endif // ALSAMIDI_ENABLED
#endif // MIDI_DRIVER_ALSAMIDI_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"
@ -125,6 +125,6 @@ public:
~AudioDriverPulseAudio();
};
#endif // AUDIO_DRIVER_PULSEAUDIO_H
#endif // PULSEAUDIO_ENABLED
#endif // AUDIO_DRIVER_PULSEAUDIO_H