From 8861923455a294927398c3207c12ed3e2d6f350e Mon Sep 17 00:00:00 2001
From: Vincent Sanders <vince@kyllikki.org>
Date: Mon, 6 Jun 2016 14:47:27 +0100
Subject: Allow include directories to be added by sub makefiles

---
 content/handlers/css/css.c      |  6 +++---
 content/handlers/css/dump.c     |  2 +-
 content/handlers/css/hints.c    |  4 ++--
 content/handlers/css/internal.c |  2 +-
 content/handlers/css/select.c   | 10 +++++-----
 content/handlers/css/utils.c    |  2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'content/handlers/css')

diff --git a/content/handlers/css/css.c b/content/handlers/css/css.c
index 4c0cb7a4c..997eb5115 100644
--- a/content/handlers/css/css.c
+++ b/content/handlers/css/css.c
@@ -30,9 +30,9 @@
 #include "utils/log.h"
 #include "utils/messages.h"
 
-#include "css.h"
-#include "hints.h"
-#include "internal.h"
+#include "css/css.h"
+#include "css/hints.h"
+#include "css/internal.h"
 
 /* Define to trace import fetches */
 #undef NSCSS_IMPORT_TRACE
diff --git a/content/handlers/css/dump.c b/content/handlers/css/dump.c
index 125b133cf..1ad188cb8 100644
--- a/content/handlers/css/dump.c
+++ b/content/handlers/css/dump.c
@@ -19,7 +19,7 @@
 #include <stdio.h>
 #include <libcss/libcss.h>
 
-#include "dump.h"
+#include "css/dump.h"
 
 /**
  * Dump a fixed point value to the stream in a textual form.
diff --git a/content/handlers/css/hints.c b/content/handlers/css/hints.c
index f394ea836..fd25d5397 100644
--- a/content/handlers/css/hints.c
+++ b/content/handlers/css/hints.c
@@ -25,8 +25,8 @@
 #include "utils/nsurl.h"
 #include "utils/utils.h"
 
-#include "hints.h"
-#include "select.h"
+#include "css/hints.h"
+#include "css/select.h"
 
 #define LOG_STATS
 #undef LOG_STATS
diff --git a/content/handlers/css/internal.c b/content/handlers/css/internal.c
index d66b87a54..14ad00c4f 100644
--- a/content/handlers/css/internal.c
+++ b/content/handlers/css/internal.c
@@ -21,7 +21,7 @@
 
 #include "utils/nsurl.h"
 
-#include "internal.h"
+#include "css/internal.h"
 
 /* exported interface documented in content/handlers/css/internal.h */
 css_error nscss_resolve_url(void *pw, const char *base,
diff --git a/content/handlers/css/select.c b/content/handlers/css/select.c
index ea324e773..6af20145a 100644
--- a/content/handlers/css/select.c
+++ b/content/handlers/css/select.c
@@ -20,15 +20,15 @@
 #include <string.h>
 #include <strings.h>
 
-#include "content/urldb.h"
-#include "desktop/system_colour.h"
 #include "utils/nsoption.h"
 #include "utils/corestrings.h"
 #include "utils/log.h"
+#include "content/urldb.h"
+#include "desktop/system_colour.h"
 
-#include "internal.h"
-#include "hints.h"
-#include "select.h"
+#include "css/internal.h"
+#include "css/hints.h"
+#include "css/select.h"
 
 static css_error node_name(void *pw, void *node, css_qname *qname);
 static css_error node_classes(void *pw, void *node,
diff --git a/content/handlers/css/utils.c b/content/handlers/css/utils.c
index 59ad41216..5c7cbd9a7 100644
--- a/content/handlers/css/utils.c
+++ b/content/handlers/css/utils.c
@@ -22,7 +22,7 @@
 #include "utils/nsoption.h"
 #include "utils/log.h"
 
-#include "utils.h"
+#include "css/utils.h"
 
 /** Screen DPI in fixed point units: defaults to 90, which RISC OS uses */
 css_fixed nscss_screen_dpi = F_90;
-- 
cgit v1.2.3