From 84597399525d99fe036ea93feedb7993f326de50 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Wed, 9 Jan 2019 20:30:51 +0100
Subject: Sort includes from local to standard and fix exposed issues

This order is better because it ensures that headers can stand alone and
include everything they need.  Several missing includes were exposed by this,
and are also fixed in this commit.
---
 lv2/atom/atom-test.c | 10 +++++-----
 lv2/atom/forge.h     |  6 +++---
 lv2/atom/util.h      |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'lv2/atom')

diff --git a/lv2/atom/atom-test.c b/lv2/atom/atom-test.c
index 98c9ae2..63a2bfe 100644
--- a/lv2/atom/atom-test.c
+++ b/lv2/atom/atom-test.c
@@ -14,6 +14,11 @@
   OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
+#include "lv2/atom/atom.h"
+#include "lv2/atom/forge.h"
+#include "lv2/atom/util.h"
+#include "lv2/urid/urid.h"
+
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdint.h>
@@ -21,11 +26,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "lv2/atom/atom.h"
-#include "lv2/atom/forge.h"
-#include "lv2/atom/util.h"
-#include "lv2/urid/urid.h"
-
 char**   uris   = NULL;
 uint32_t n_uris = 0;
 
diff --git a/lv2/atom/forge.h b/lv2/atom/forge.h
index 50e962b..e866b38 100644
--- a/lv2/atom/forge.h
+++ b/lv2/atom/forge.h
@@ -48,14 +48,14 @@
 #ifndef LV2_ATOM_FORGE_H
 #define LV2_ATOM_FORGE_H
 
-#include <assert.h>
-#include <stdbool.h>
-
 #include "lv2/atom/atom.h"
 #include "lv2/atom/util.h"
 #include "lv2/core/attributes.h"
 #include "lv2/urid/urid.h"
 
+#include <assert.h>
+#include <stdbool.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
diff --git a/lv2/atom/util.h b/lv2/atom/util.h
index 5151f84..cf24a53 100644
--- a/lv2/atom/util.h
+++ b/lv2/atom/util.h
@@ -31,13 +31,13 @@
 #ifndef LV2_ATOM_UTIL_H
 #define LV2_ATOM_UTIL_H
 
+#include "lv2/atom/atom.h"
+
 #include <stdarg.h>
 #include <stdbool.h>
 #include <stdint.h>
 #include <string.h>
 
-#include "lv2/atom/atom.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
-- 
cgit v1.2.1