summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMarcel Admiraal <madmiraal@users.noreply.github.com>2020-09-03 11:28:55 +0100
committerMarcel Admiraal <madmiraal@users.noreply.github.com>2020-09-03 11:29:42 +0100
commitf6ad1954f76165aefb05e12e5f82cbf5d763c85e (patch)
treee125249063f688eb90582016838d0c876a68918c /drivers
parent493b30821529baf2c235eb387f2b7964774c0cc7 (diff)
Ensure header guards enclose entire header.
Diffstat (limited to 'drivers')
-rw-r--r--drivers/alsa/audio_driver_alsa.h8
-rw-r--r--drivers/alsamidi/midi_driver_alsamidi.h7
-rw-r--r--drivers/pulseaudio/audio_driver_pulseaudio.h8
3 files changed, 12 insertions, 11 deletions
diff --git a/drivers/alsa/audio_driver_alsa.h b/drivers/alsa/audio_driver_alsa.h
index 7aec0c4071..d1220d126e 100644
--- a/drivers/alsa/audio_driver_alsa.h
+++ b/drivers/alsa/audio_driver_alsa.h
@@ -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
diff --git a/drivers/alsamidi/midi_driver_alsamidi.h b/drivers/alsamidi/midi_driver_alsamidi.h
index e8ed6df5b0..6aabe8e3fd 100644
--- a/drivers/alsamidi/midi_driver_alsamidi.h
+++ b/drivers/alsamidi/midi_driver_alsamidi.h
@@ -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
diff --git a/drivers/pulseaudio/audio_driver_pulseaudio.h b/drivers/pulseaudio/audio_driver_pulseaudio.h
index 2f2ad0fc38..35ccae94b8 100644
--- a/drivers/pulseaudio/audio_driver_pulseaudio.h
+++ b/drivers/pulseaudio/audio_driver_pulseaudio.h
@@ -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