Make include guards surround all header contents

For consistency, and because clang-tidy can't figure out if a define is an
include guard unless it ends the file.

lv2/atom/atom.h

@@ -14,6 +14,9 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#ifndef LV2_ATOM_H
+#define LV2_ATOM_H
+
 /**
    @defgroup atom Atom
    @ingroup lv2
@@ -25,9 +28,6 @@
    @{
 */
 
-#ifndef LV2_ATOM_H
-#define LV2_ATOM_H
-
 #include <stdint.h>
 
 // clang-format off
@@ -250,12 +250,12 @@ typedef struct {
 	LV2_Atom_Sequence_Body body;  /**< Body. */
 } LV2_Atom_Sequence;
 
-/**
-   @}
-*/
-
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
 
+/**
+   @}
+*/
+
 #endif  /* LV2_ATOM_H */

lv2/atom/forge.h

@@ -39,6 +39,9 @@
    This header is non-normative, it is provided for convenience.
 */
 
+#ifndef LV2_ATOM_FORGE_H
+#define LV2_ATOM_FORGE_H
+
 /**
    @defgroup forge Forge
    @ingroup atom
@@ -48,9 +51,6 @@
    @{
 */
 
-#ifndef LV2_ATOM_FORGE_H
-#define LV2_ATOM_FORGE_H
-
 #include "lv2/atom/atom.h"
 #include "lv2/atom/util.h"
 #include "lv2/core/attributes.h"
@@ -687,15 +687,15 @@ lv2_atom_forge_beat_time(LV2_Atom_Forge* forge, double beats)
 	return lv2_atom_forge_write(forge, &beats, sizeof(beats));
 }
 
-/**
-   @}
-   @}
-*/
-
 LV2_RESTORE_WARNINGS
 
 #ifdef __cplusplus
 }  /* extern "C" */
 #endif
 
+/**
+   @}
+   @}
+*/
+
 #endif  /* LV2_ATOM_FORGE_H */

lv2/atom/util.h

@@ -14,6 +14,9 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#ifndef LV2_ATOM_UTIL_H
+#define LV2_ATOM_UTIL_H
+
 /**
    @file util.h Helper functions for the LV2 Atom extension.
 
@@ -31,9 +34,6 @@
    @{
 */
 
-#ifndef LV2_ATOM_UTIL_H
-#define LV2_ATOM_UTIL_H
-
 #include "lv2/atom/atom.h"
 
 #include <stdarg.h>
@@ -512,13 +512,13 @@ lv2_atom_object_get_typed(const LV2_Atom_Object* object, ...)
 	return matches;
 }
 
+#ifdef __cplusplus
+}  /* extern "C" */
+#endif
+
 /**
    @}
    @}
 */
 
-#ifdef __cplusplus
-}  /* extern "C" */
-#endif
-
 #endif /* LV2_ATOM_UTIL_H */

lv2/core/lv2.h

@@ -18,6 +18,9 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#ifndef LV2_H_INCLUDED
+#define LV2_H_INCLUDED
+
 /**
    @defgroup lv2 LV2
 
@@ -36,9 +39,6 @@
    @{
 */
 
-#ifndef LV2_H_INCLUDED
-#define LV2_H_INCLUDED
-
 #include <stdint.h>
 
 // clang-format off
@@ -477,12 +477,12 @@ typedef const LV2_Lib_Descriptor *
                                const LV2_Feature *const * features);
 
 #ifdef __cplusplus
-}
+} /* extern "C" */
 #endif
 
-#endif /* LV2_H_INCLUDED */
-
 /**
    @}
    @}
 */
+
+#endif /* LV2_H_INCLUDED */

lv2/data-access/data-access.h

@@ -15,6 +15,9 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#ifndef LV2_DATA_ACCESS_H
+#define LV2_DATA_ACCESS_H
+
 /**
    @defgroup data-access Data Access
    @ingroup lv2
@@ -26,9 +29,6 @@
    @{
 */
 
-#ifndef LV2_DATA_ACCESS_H
-#define LV2_DATA_ACCESS_H
-
 // clang-format off
 
 #define LV2_DATA_ACCESS_URI    "http://lv2plug.in/ns/ext/data-access"  ///< http://lv2plug.in/ns/ext/data-access
@@ -67,8 +67,8 @@ typedef struct {
 }  /* extern "C" */
 #endif
 
-#endif  /* LV2_DATA_ACCESS_H */
-
 /**
    @}
 */
+
+#endif  /* LV2_DATA_ACCESS_H */

lv2/dynmanifest/dynmanifest.h

@@ -15,6 +15,9 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#ifndef LV2_DYN_MANIFEST_H_INCLUDED
+#define LV2_DYN_MANIFEST_H_INCLUDED
+
 /**
    @defgroup dynmanifest Dynamic Manifest
    @ingroup lv2
@@ -26,9 +29,6 @@
    @{
 */
 
-#ifndef LV2_DYN_MANIFEST_H_INCLUDED
-#define LV2_DYN_MANIFEST_H_INCLUDED
-
 #include "lv2/core/lv2.h"
 
 #include <stdio.h>
@@ -147,11 +147,11 @@ int lv2_dyn_manifest_get_data(LV2_Dyn_Manifest_Handle handle,
 void lv2_dyn_manifest_close(LV2_Dyn_Manifest_Handle handle);
 
 #ifdef __cplusplus
-}
+} /* extern "C" */
 #endif
 
-#endif /* LV2_DYN_MANIFEST_H_INCLUDED */
-
 /**
    @}
 */
+
+#endif /* LV2_DYN_MANIFEST_H_INCLUDED */

lv2/event/event-helpers.h

@@ -14,14 +14,14 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#ifndef LV2_EVENT_HELPERS_H
+#define LV2_EVENT_HELPERS_H
+
 /**
    @file event-helpers.h Helper functions for the LV2 Event extension
    <http://lv2plug.in/ns/ext/event>.
 */
 
-#ifndef LV2_EVENT_HELPERS_H
-#define LV2_EVENT_HELPERS_H
-
 #include "lv2/core/attributes.h"
 #include "lv2/event/event.h"
 

lv2/event/event.h

@@ -15,6 +15,9 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#ifndef LV2_EVENT_H
+#define LV2_EVENT_H
+
 /**
    @defgroup event Event
    @ingroup lv2
@@ -26,9 +29,6 @@
    @{
 */
 
-#ifndef LV2_EVENT_H
-#define LV2_EVENT_H
-
 // clang-format off
 
 #define LV2_EVENT_URI    "http://lv2plug.in/ns/ext/event"  ///< http://lv2plug.in/ns/ext/event
@@ -302,8 +302,8 @@ LV2_RESTORE_WARNINGS
 }  /* extern "C" */
 #endif
 
-#endif /* LV2_EVENT_H */
-
 /**
    @}
 */
+
+#endif /* LV2_EVENT_H */

lv2/instance-access/instance-access.h

@@ -15,6 +15,9 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#ifndef LV2_INSTANCE_ACCESS_H
+#define LV2_INSTANCE_ACCESS_H
+
 /**
    @defgroup instance-access Instance Access
    @ingroup lv2
@@ -26,17 +29,14 @@
    @{
 */
 
-#ifndef LV2_INSTANCE_ACCESS_H
-#define LV2_INSTANCE_ACCESS_H
-
 // clang-format off
 
 #define LV2_INSTANCE_ACCESS_URI "http://lv2plug.in/ns/ext/instance-access"  ///< http://lv2plug.in/ns/ext/instance-access
 
 // clang-format on
 
-#endif  /* LV2_INSTANCE_ACCESS_H */
-
 /**
    @}
 */
+
+#endif  /* LV2_INSTANCE_ACCESS_H */

lv2/log/log.h

@@ -14,6 +14,9 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#ifndef LV2_LOG_H
+#define LV2_LOG_H
+
 /**
    @defgroup log Log
    @ingroup lv2
@@ -25,9 +28,6 @@
    @{
 */
 
-#ifndef LV2_LOG_H
-#define LV2_LOG_H
-
 // clang-format off
 
 #define LV2_LOG_URI    "http://lv2plug.in/ns/ext/log"  ///< http://lv2plug.in/ns/ext/log
@@ -108,8 +108,8 @@ typedef struct {
 }  /* extern "C" */
 #endif
 
-#endif  /* LV2_LOG_H */
-
 /**
    @}
 */
+
+#endif  /* LV2_LOG_H */

lv2/log/logger.h

@@ -14,6 +14,9 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#ifndef LV2_ATOM_LOGGER_H
+#define LV2_ATOM_LOGGER_H
+
 /**
    @defgroup logger Logger
    @ingroup log
@@ -25,9 +28,6 @@
    @{
 */
 
-#ifndef LV2_ATOM_LOGGER_H
-#define LV2_ATOM_LOGGER_H
-
 #include "lv2/log/log.h"
 #include "lv2/urid/urid.h"
 
@@ -152,8 +152,8 @@ lv2_log_warning(LV2_Log_Logger* logger, const char* fmt, ...)
 }  /* extern "C" */
 #endif
 
-#endif  /* LV2_LOG_LOGGER_H */
-
 /**
    @}
 */
+
+#endif  /* LV2_LOG_LOGGER_H */

lv2/midi/midi.h

@@ -14,6 +14,9 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#ifndef LV2_MIDI_H
+#define LV2_MIDI_H
+
 /**
    @defgroup midi MIDI
    @ingroup lv2
@@ -25,9 +28,6 @@
    @{
 */
 
-#ifndef LV2_MIDI_H
-#define LV2_MIDI_H
-
 #include <stdbool.h>
 #include <stdint.h>
 
@@ -234,8 +234,8 @@ lv2_midi_message_type(const uint8_t* msg) {
 }  /* extern "C" */
 #endif
 
-#endif  /* LV2_MIDI_H */
-
 /**
    @}
 */
+
+#endif  /* LV2_MIDI_H */

lv2/morph/morph.h

@@ -14,6 +14,9 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#ifndef LV2_MORPH_H
+#define LV2_MORPH_H
+
 /**
    @defgroup morph Morph
    @ingroup lv2
@@ -25,9 +28,6 @@
    @{
 */
 
-#ifndef LV2_MORPH_H
-#define LV2_MORPH_H
-
 // clang-format off
 
 #define LV2_MORPH_URI    "http://lv2plug.in/ns/ext/morph"  ///< http://lv2plug.in/ns/ext/morph
@@ -41,8 +41,8 @@
 
 // clang-format on
 
-#endif  /* LV2_MORPH_H */
-
 /**
    @}
 */
+
+#endif  /* LV2_MORPH_H */

lv2/options/options.h

@@ -14,6 +14,9 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#ifndef LV2_OPTIONS_H
+#define LV2_OPTIONS_H
+
 /**
    @defgroup options Options
    @ingroup lv2
@@ -25,9 +28,6 @@
    @{
 */
 
-#ifndef LV2_OPTIONS_H
-#define LV2_OPTIONS_H
-
 #include "lv2/core/lv2.h"
 #include "lv2/urid/urid.h"
 
@@ -144,8 +144,8 @@ typedef struct {
 }  /* extern "C" */
 #endif
 
-#endif  /* LV2_OPTIONS_H */
-
 /**
    @}
 */
+
+#endif  /* LV2_OPTIONS_H */

lv2/parameters/parameters.h

@@ -14,6 +14,9 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#ifndef LV2_PARAMETERS_H
+#define LV2_PARAMETERS_H
+
 /**
    @defgroup parameters Parameters
    @ingroup lv2
@@ -25,9 +28,6 @@
    @{
 */
 
-#ifndef LV2_PARAMETERS_H
-#define LV2_PARAMETERS_H
-
 // clang-format off
 
 #define LV2_PARAMETERS_URI    "http://lv2plug.in/ns/ext/parameters"  ///< http://lv2plug.in/ns/ext/parameters
@@ -61,8 +61,8 @@
 
 // clang-format on
 
-#endif  /* LV2_PARAMETERS_H */
-
 /**
    @}
 */
+
+#endif  /* LV2_PARAMETERS_H */

lv2/patch/patch.h

@@ -14,6 +14,9 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#ifndef LV2_PATCH_H
+#define LV2_PATCH_H
+
 /**
    @defgroup patch Patch
    @ingroup lv2
@@ -28,9 +31,6 @@
    @{
 */
 
-#ifndef LV2_PATCH_H
-#define LV2_PATCH_H
-
 // clang-format off
 
 #define LV2_PATCH_URI    "http://lv2plug.in/ns/ext/patch"  ///< http://lv2plug.in/ns/ext/patch
@@ -66,8 +66,8 @@
 
 // clang-format on
 
-#endif  /* LV2_PATCH_H */
-
 /**
    @}
 */
+
+#endif  /* LV2_PATCH_H */

lv2/port-groups/port-groups.h

@@ -14,6 +14,9 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#ifndef LV2_PORT_GROUPS_H
+#define LV2_PORT_GROUPS_H
+
 /**
    @defgroup port-groups Port Groups
    @ingroup lv2
@@ -25,9 +28,6 @@
    @{
 */
 
-#ifndef LV2_PORT_GROUPS_H
-#define LV2_PORT_GROUPS_H
-
 // clang-format off
 
 #define LV2_PORT_GROUPS_URI    "http://lv2plug.in/ns/ext/port-groups"  ///< http://lv2plug.in/ns/ext/port-groups
@@ -70,8 +70,8 @@
 
 // clang-format on
 
-#endif  /* LV2_PORT_GROUPS_H */
-
 /**
    @}
 */
+
+#endif  /* LV2_PORT_GROUPS_H */

lv2/port-props/port-props.h

@@ -14,6 +14,9 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#ifndef LV2_PORT_PROPS_H
+#define LV2_PORT_PROPS_H
+
 /**
    @defgroup port-props Port Properties
    @ingroup lv2
@@ -23,9 +26,6 @@
    @{
 */
 
-#ifndef LV2_PORT_PROPS_H
-#define LV2_PORT_PROPS_H
-
 // clang-format off
 
 #define LV2_PORT_PROPS_URI    "http://lv2plug.in/ns/ext/port-props"  ///< http://lv2plug.in/ns/ext/port-props
@@ -46,8 +46,8 @@
 
 // clang-format on
 
-#endif  /* LV2_PORT_PROPS_H */
-
 /**
    @}
 */
+
+#endif  /* LV2_PORT_PROPS_H */

lv2/presets/presets.h

@@ -14,6 +14,9 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#ifndef LV2_PRESETS_H
+#define LV2_PRESETS_H
+
 /**
    @defgroup presets Presets
    @ingroup lv2
@@ -25,9 +28,6 @@
    @{
 */
 
-#ifndef LV2_PRESETS_H
-#define LV2_PRESETS_H
-
 // clang-format off
 
 #define LV2_PRESETS_URI    "http://lv2plug.in/ns/ext/presets"  ///< http://lv2plug.in/ns/ext/presets
@@ -41,8 +41,8 @@
 
 // clang-format on
 
-#endif  /* LV2_PRESETS_H */
-
 /**
    @}
 */
+
+#endif  /* LV2_PRESETS_H */

lv2/resize-port/resize-port.h

@@ -14,6 +14,9 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#ifndef LV2_RESIZE_PORT_H
+#define LV2_RESIZE_PORT_H
+
 /**
    @defgroup resize-port Resize Port
    @ingroup lv2
@@ -23,9 +26,6 @@
    @{
 */
 
-#ifndef LV2_RESIZE_PORT_H
-#define LV2_RESIZE_PORT_H
-
 #include <stddef.h>
 #include <stdint.h>
 
@@ -82,8 +82,8 @@ typedef struct {
 }  /* extern "C" */
 #endif
 
-#endif  /* LV2_RESIZE_PORT_H */
-
 /**
    @}
 */
+
+#endif  /* LV2_RESIZE_PORT_H */

lv2/state/state.h

@@ -15,6 +15,9 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#ifndef LV2_STATE_H
+#define LV2_STATE_H
+
 /**
    @defgroup state State
    @ingroup lv2
@@ -26,9 +29,6 @@
    @{
 */
 
-#ifndef LV2_STATE_H
-#define LV2_STATE_H
-
 #include "lv2/core/lv2.h"
 
 #include <stddef.h>
@@ -386,8 +386,8 @@ typedef struct {
 } /* extern "C" */
 #endif
 
-#endif /* LV2_STATE_H */
-
 /**
    @}
 */
+
+#endif /* LV2_STATE_H */

lv2/time/time.h

@@ -14,6 +14,9 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#ifndef LV2_TIME_H
+#define LV2_TIME_H
+
 /**
    @defgroup time Time
    @ingroup lv2
@@ -28,9 +31,6 @@
    @{
 */
 
-#ifndef LV2_TIME_H
-#define LV2_TIME_H
-
 // clang-format off
 
 #define LV2_TIME_URI    "http://lv2plug.in/ns/ext/time"  ///< http://lv2plug.in/ns/ext/time

lv2/ui/ui.h

@@ -16,6 +16,9 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#ifndef LV2_UI_H
+#define LV2_UI_H
+
 /**
    @defgroup ui User Interfaces
    @ingroup lv2
@@ -27,9 +30,6 @@
    @{
 */
 
-#ifndef LV2_UI_H
-#define LV2_UI_H
-
 #include "lv2/core/lv2.h"
 #include "lv2/urid/urid.h"
 
@@ -537,8 +537,8 @@ typedef const LV2UI_Descriptor* (*LV2UI_DescriptorFunction)(uint32_t index);
 }
 #endif
 
-#endif /* LV2_UI_H */
-
 /**
    @}
 */
+
+#endif /* LV2_UI_H */

lv2/units/units.h

@@ -14,6 +14,9 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#ifndef LV2_UNITS_H
+#define LV2_UNITS_H
+
 /**
    @defgroup units Units
    @ingroup lv2
@@ -25,9 +28,6 @@
    @{
 */
 
-#ifndef LV2_UNITS_H
-#define LV2_UNITS_H
-
 // clang-format off
 
 #define LV2_UNITS_URI    "http://lv2plug.in/ns/extensions/units"  ///< http://lv2plug.in/ns/extensions/units
@@ -68,8 +68,8 @@
 
 // clang-format on
 
-#endif  /* LV2_UNITS_H */
-
 /**
    @}
 */
+
+#endif  /* LV2_UNITS_H */

lv2/uri-map/uri-map.h

@@ -14,6 +14,9 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#ifndef LV2_URI_MAP_H
+#define LV2_URI_MAP_H
+
 /**
    @defgroup uri-map URI Map
    @ingroup lv2
@@ -33,9 +36,6 @@
    @{
 */
 
-#ifndef LV2_URI_MAP_H
-#define LV2_URI_MAP_H
-
 // clang-format off
 
 #define LV2_URI_MAP_URI    "http://lv2plug.in/ns/ext/uri-map"  ///< http://lv2plug.in/ns/ext/uri-map
@@ -114,8 +114,8 @@ LV2_RESTORE_WARNINGS
 }  /* extern "C" */
 #endif
 
-#endif /* LV2_URI_MAP_H */
-
 /**
    @}
 */
+
+#endif /* LV2_URI_MAP_H */

lv2/urid/urid.h

@@ -15,6 +15,9 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#ifndef LV2_URID_H
+#define LV2_URID_H
+
 /**
    @defgroup urid URID
    @ingroup lv2
@@ -26,9 +29,6 @@
    @{
 */
 
-#ifndef LV2_URID_H
-#define LV2_URID_H
-
 // clang-format off
 
 #define LV2_URID_URI    "http://lv2plug.in/ns/ext/urid"  ///< http://lv2plug.in/ns/ext/urid
@@ -135,8 +135,8 @@ typedef struct {
 }  /* extern "C" */
 #endif
 
-#endif /* LV2_URID_H */
-
 /**
    @}
 */
+
+#endif /* LV2_URID_H */

lv2/worker/worker.h

@@ -14,6 +14,9 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#ifndef LV2_WORKER_H
+#define LV2_WORKER_H
+
 /**
    @defgroup worker Worker
    @ingroup lv2
@@ -25,9 +28,6 @@
    @{
 */
 
-#ifndef LV2_WORKER_H
-#define LV2_WORKER_H
-
 #include "lv2/core/lv2.h"
 
 #include <stdint.h>
@@ -176,8 +176,8 @@ typedef struct {
 }  /* extern "C" */
 #endif
 
-#endif  /* LV2_WORKER_H */
-
 /**
    @}
 */
+
+#endif  /* LV2_WORKER_H */

plugins/eg-sampler.lv2/peaks.h

@@ -15,6 +15,9 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#ifndef PEAKS_H_INCLUDED
+#define PEAKS_H_INCLUDED
+
 /**
    This file defines utilities for sending and receiving audio peaks for
    waveform display.  The functionality is divided into two objects:
@@ -25,9 +28,6 @@
    requested, with reasonably sized incremental updates sent over plugin ports.
 */
 
-#ifndef PEAKS_H_INCLUDED
-#define PEAKS_H_INCLUDED
-
 #include "lv2/atom/atom.h"
 #include "lv2/atom/forge.h"
 #include "lv2/atom/util.h"