From c5a9a86a6b4b623eab004bec7500a39d39a43bcd Mon Sep 17 00:00:00 2001 From: David Robillard Date: Fri, 11 Feb 2011 18:22:38 +0000 Subject: Tidy up includes. git-svn-id: http://svn.drobilla.net/lad/trunk/slv2@2920 a436a847-0d15-0410-975c-d299462d15a1 --- src/collections.c | 5 ++--- src/plugin.c | 4 +++- src/pluginclass.c | 3 ++- src/plugininstance.c | 3 ++- src/plugins.c | 11 ++++++----- src/pluginui.c | 5 +++-- src/pluginuiinstance.c | 6 ++++-- src/port.c | 8 +++++--- src/query.c | 4 +++- src/scalepoint.c | 4 +++- src/slv2_internal.h | 10 +++++++--- src/util.c | 4 ++-- src/value.c | 6 ++++-- src/world.c | 11 +++++++---- 14 files changed, 53 insertions(+), 31 deletions(-) (limited to 'src') diff --git a/src/collections.c b/src/collections.c index 83c98f3..df84581 100644 --- a/src/collections.c +++ b/src/collections.c @@ -16,13 +16,12 @@ * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. */ -#define _XOPEN_SOURCE 500 +#include -#include -#include #include "slv2/collections.h" #include "slv2/pluginclass.h" #include "slv2/pluginui.h" +#include "slv2/value.h" #include "slv2_internal.h" /* ARRAYS */ diff --git a/src/plugin.c b/src/plugin.c index 279c657..9c13d06 100644 --- a/src/plugin.c +++ b/src/plugin.c @@ -22,13 +22,15 @@ #include #include #include + #ifdef SLV2_DYN_MANIFEST #include #endif -#include "slv2/types.h" + #include "slv2/collections.h" #include "slv2/plugin.h" #include "slv2/pluginclass.h" +#include "slv2/types.h" #include "slv2/util.h" #include "slv2_internal.h" diff --git a/src/pluginclass.c b/src/pluginclass.c index 4aef8f4..9780e8a 100644 --- a/src/pluginclass.c +++ b/src/pluginclass.c @@ -21,8 +21,9 @@ #include #include #include -#include "slv2/types.h" + #include "slv2/pluginclass.h" +#include "slv2/types.h" #include "slv2/value.h" #include "slv2_internal.h" diff --git a/src/plugininstance.c b/src/plugininstance.c index 7416dc3..b0402a7 100644 --- a/src/plugininstance.c +++ b/src/plugininstance.c @@ -18,10 +18,11 @@ #define _XOPEN_SOURCE 500 +#include #include #include #include -#include + #include "slv2/plugin.h" #include "slv2/plugininstance.h" #include "slv2/types.h" diff --git a/src/plugins.c b/src/plugins.c index 30bc076..2f0598a 100644 --- a/src/plugins.c +++ b/src/plugins.c @@ -17,14 +17,15 @@ */ #define _XOPEN_SOURCE 500 -#include -#include + +#include #include #include -#include -#include "slv2/types.h" -#include "slv2/plugin.h" +#include + #include "slv2/collections.h" +#include "slv2/plugin.h" +#include "slv2/types.h" #include "slv2/util.h" #include "slv2_internal.h" diff --git a/src/pluginui.c b/src/pluginui.c index 8778d3a..f5a05f1 100644 --- a/src/pluginui.c +++ b/src/pluginui.c @@ -19,11 +19,12 @@ #define _XOPEN_SOURCE 500 #include -#include #include +#include + #include "slv2/collections.h" -#include "slv2/types.h" #include "slv2/pluginui.h" +#include "slv2/types.h" #include "slv2_internal.h" SLV2UI diff --git a/src/pluginuiinstance.c b/src/pluginuiinstance.c index 3fee84b..852e394 100644 --- a/src/pluginuiinstance.c +++ b/src/pluginuiinstance.c @@ -19,15 +19,17 @@ #define _XOPEN_SOURCE 500 +#include #include #include #include -#include + #include -#include "slv2/types.h" + #include "slv2/plugin.h" #include "slv2/pluginui.h" #include "slv2/pluginuiinstance.h" +#include "slv2/types.h" #include "slv2/util.h" #include "slv2_internal.h" diff --git a/src/port.c b/src/port.c index fd44512..04231c3 100644 --- a/src/port.c +++ b/src/port.c @@ -17,14 +17,16 @@ */ #define _XOPEN_SOURCE 500 + #include -#include +#include #include +#include #include -#include -#include "slv2/types.h" + #include "slv2/collections.h" #include "slv2/port.h" +#include "slv2/types.h" #include "slv2/util.h" #include "slv2_internal.h" diff --git a/src/query.c b/src/query.c index 4e60b41..dad639b 100644 --- a/src/query.c +++ b/src/query.c @@ -17,13 +17,15 @@ */ #define _XOPEN_SOURCE 500 + #include #include #include #include -#include "slv2/types.h" + #include "slv2/collections.h" #include "slv2/plugin.h" +#include "slv2/types.h" #include "slv2/util.h" #include "slv2_internal.h" diff --git a/src/scalepoint.c b/src/scalepoint.c index 55056c8..3b4ea37 100644 --- a/src/scalepoint.c +++ b/src/scalepoint.c @@ -18,10 +18,12 @@ #define _XOPEN_SOURCE 500 +#include #include #include -#include + #include + #include "slv2/scalepoint.h" #include "slv2/types.h" #include "slv2/value.h" diff --git a/src/slv2_internal.h b/src/slv2_internal.h index 55f5b93..f8ba415 100644 --- a/src/slv2_internal.h +++ b/src/slv2_internal.h @@ -29,17 +29,21 @@ extern "C" { #include #include #include -#include + #include + #include + #include "serd/serd.h" #include "sord/sord.h" -#include "slv2/types.h" -#include "slv2/lv2_ui.h" + #ifdef SLV2_DYN_MANIFEST #include "lv2/lv2plug.in/ns/ext/dyn-manifest/dyn-manifest.h" #endif +#include "slv2/types.h" +#include "slv2/lv2_ui.h" + #define SLV2_NS_DOAP (const uint8_t*)"http://usefulinc.com/ns/doap#" #define SLV2_NS_RDFS (const uint8_t*)"http://www.w3.org/2000/01/rdf-schema#" #define SLV2_NS_SLV2 (const uint8_t*)"http://drobilla.net/ns/slv2#" diff --git a/src/util.c b/src/util.c index bcb5e6c..f1295f0 100644 --- a/src/util.c +++ b/src/util.c @@ -18,10 +18,10 @@ #define _XOPEN_SOURCE 500 -#include -#include #include #include +#include +#include #include "slv2/util.h" #include "slv2_internal.h" diff --git a/src/value.c b/src/value.c index 6e11004..e08b7fd 100644 --- a/src/value.c +++ b/src/value.c @@ -18,11 +18,13 @@ #define _XOPEN_SOURCE 500 -#include -#include #include #include +#include +#include + #include + #include "slv2/types.h" #include "slv2/value.h" #include "slv2_internal.h" diff --git a/src/world.c b/src/world.c index d7dbd9d..d9e46cd 100644 --- a/src/world.c +++ b/src/world.c @@ -17,18 +17,21 @@ */ #define _XOPEN_SOURCE 500 + #include +#include + #include #include -#include #ifdef SLV2_DYN_MANIFEST #include #endif -#include "slv2/types.h" -#include "slv2/world.h" + +#include "slv2-config.h" #include "slv2/slv2.h" +#include "slv2/types.h" #include "slv2/util.h" -#include "slv2-config.h" +#include "slv2/world.h" #include "slv2_internal.h" static void -- cgit v1.2.1