From 677eee0a8a1ca270860c11bc411abb48ae5e455e Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Wed, 9 Jan 2019 20:23:19 +0100
Subject: Remove workaround for ancient MSVC

---
 lv2/atom/forge.h                 | 3 +--
 lv2/atom/util.h                  | 3 +--
 lv2/core/lv2_util.h              | 3 +--
 lv2/event/event-helpers.h        | 3 +--
 lv2/midi/midi.h                  | 3 +--
 lv2/resize-port/resize-port.h    | 3 +--
 lv2/state/state.h                | 3 +--
 lv2/ui/ui.h                      | 3 +--
 plugins/eg-fifths.lv2/fifths.c   | 4 +---
 plugins/eg-metro.lv2/metro.c     | 4 +---
 plugins/eg-params.lv2/params.c   | 4 +---
 plugins/eg-sampler.lv2/sampler.c | 4 +---
 12 files changed, 12 insertions(+), 28 deletions(-)

diff --git a/lv2/atom/forge.h b/lv2/atom/forge.h
index 826b2d1..50e962b 100644
--- a/lv2/atom/forge.h
+++ b/lv2/atom/forge.h
@@ -49,6 +49,7 @@
 #define LV2_ATOM_FORGE_H
 
 #include <assert.h>
+#include <stdbool.h>
 
 #include "lv2/atom/atom.h"
 #include "lv2/atom/util.h"
@@ -57,8 +58,6 @@
 
 #ifdef __cplusplus
 extern "C" {
-#else
-#    include <stdbool.h>
 #endif
 
 // Disable deprecation warnings for Blank and Resource
diff --git a/lv2/atom/util.h b/lv2/atom/util.h
index b507180..5151f84 100644
--- a/lv2/atom/util.h
+++ b/lv2/atom/util.h
@@ -32,6 +32,7 @@
 #define LV2_ATOM_UTIL_H
 
 #include <stdarg.h>
+#include <stdbool.h>
 #include <stdint.h>
 #include <string.h>
 
@@ -39,8 +40,6 @@
 
 #ifdef __cplusplus
 extern "C" {
-#else
-#    include <stdbool.h>
 #endif
 
 /** Pad a size to 64 bits. */
diff --git a/lv2/core/lv2_util.h b/lv2/core/lv2_util.h
index e82d097..7717b72 100644
--- a/lv2/core/lv2_util.h
+++ b/lv2/core/lv2_util.h
@@ -21,14 +21,13 @@
 */
 
 #include <stdarg.h>
+#include <stdbool.h>
 #include <string.h>
 
 #include "lv2/core/lv2.h"
 
 #ifdef __cplusplus
 extern "C" {
-#else
-#    include <stdbool.h>
 #endif
 
 /**
diff --git a/lv2/event/event-helpers.h b/lv2/event/event-helpers.h
index 2f0fcf5..a0e4c79 100644
--- a/lv2/event/event-helpers.h
+++ b/lv2/event/event-helpers.h
@@ -22,6 +22,7 @@
 #ifndef LV2_EVENT_HELPERS_H
 #define LV2_EVENT_HELPERS_H
 
+#include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
@@ -31,8 +32,6 @@
 
 #ifdef __cplusplus
 extern "C" {
-#else
-#    include <stdbool.h>
 #endif
 
 LV2_DISABLE_DEPRECATION_WARNINGS
diff --git a/lv2/midi/midi.h b/lv2/midi/midi.h
index 79e3a83..52e9956 100644
--- a/lv2/midi/midi.h
+++ b/lv2/midi/midi.h
@@ -26,12 +26,11 @@
 #ifndef LV2_MIDI_H
 #define LV2_MIDI_H
 
+#include <stdbool.h>
 #include <stdint.h>
 
 #ifdef __cplusplus
 extern "C" {
-#else
-#    include <stdbool.h>
 #endif
 
 #define LV2_MIDI_URI    "http://lv2plug.in/ns/ext/midi"  ///< http://lv2plug.in/ns/ext/midi
diff --git a/lv2/resize-port/resize-port.h b/lv2/resize-port/resize-port.h
index 5eb47f2..34bfe61 100644
--- a/lv2/resize-port/resize-port.h
+++ b/lv2/resize-port/resize-port.h
@@ -25,6 +25,7 @@
 #ifndef LV2_RESIZE_PORT_H
 #define LV2_RESIZE_PORT_H
 
+#include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -37,8 +38,6 @@
 
 #ifdef __cplusplus
 extern "C" {
-#else
-#    include <stdbool.h>
 #endif
 
 /** A status code for state functions. */
diff --git a/lv2/state/state.h b/lv2/state/state.h
index ffc40d1..7c1c9c0 100644
--- a/lv2/state/state.h
+++ b/lv2/state/state.h
@@ -27,6 +27,7 @@
 #ifndef LV2_STATE_H
 #define LV2_STATE_H
 
+#include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ -46,8 +47,6 @@
 
 #ifdef __cplusplus
 extern "C" {
-#else
-#    include <stdbool.h>
 #endif
 
 typedef void* LV2_State_Handle;            ///< Opaque handle for state save/restore
diff --git a/lv2/ui/ui.h b/lv2/ui/ui.h
index 96fdbac..a99b8d8 100644
--- a/lv2/ui/ui.h
+++ b/lv2/ui/ui.h
@@ -28,6 +28,7 @@
 #ifndef LV2_UI_H
 #define LV2_UI_H
 
+#include <stdbool.h>
 #include <stdint.h>
 
 #include "lv2/core/lv2.h"
@@ -73,8 +74,6 @@
 
 #ifdef __cplusplus
 extern "C" {
-#else
-#    include <stdbool.h>
 #endif
 
 /**
diff --git a/plugins/eg-fifths.lv2/fifths.c b/plugins/eg-fifths.lv2/fifths.c
index 2bbd440..9e6df7a 100644
--- a/plugins/eg-fifths.lv2/fifths.c
+++ b/plugins/eg-fifths.lv2/fifths.c
@@ -15,12 +15,10 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#ifndef __cplusplus
-#    include <stdbool.h>
-#endif
 
 #include "lv2/atom/atom.h"
 #include "lv2/atom/util.h"
diff --git a/plugins/eg-metro.lv2/metro.c b/plugins/eg-metro.lv2/metro.c
index b74b52e..a948d28 100644
--- a/plugins/eg-metro.lv2/metro.c
+++ b/plugins/eg-metro.lv2/metro.c
@@ -16,13 +16,11 @@
 */
 
 #include <math.h>
+#include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#ifndef __cplusplus
-#    include <stdbool.h>
-#endif
 
 #include "lv2/atom/atom.h"
 #include "lv2/atom/util.h"
diff --git a/plugins/eg-params.lv2/params.c b/plugins/eg-params.lv2/params.c
index 6328601..b2a79d3 100644
--- a/plugins/eg-params.lv2/params.c
+++ b/plugins/eg-params.lv2/params.c
@@ -15,13 +15,11 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#ifndef __cplusplus
-#    include <stdbool.h>
-#endif
 
 #include "lv2/atom/atom.h"
 #include "lv2/atom/forge.h"
diff --git a/plugins/eg-sampler.lv2/sampler.c b/plugins/eg-sampler.lv2/sampler.c
index efc479f..369fc1e 100644
--- a/plugins/eg-sampler.lv2/sampler.c
+++ b/plugins/eg-sampler.lv2/sampler.c
@@ -18,13 +18,11 @@
 */
 
 #include <math.h>
+#include <stdbool.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#ifndef __cplusplus
-#    include <stdbool.h>
-#endif
 
 #include <sndfile.h>
 
-- 
cgit v1.2.1