From 8861923455a294927398c3207c12ed3e2d6f350e Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Mon, 6 Jun 2016 14:47:27 +0100 Subject: Allow include directories to be added by sub makefiles --- content/handlers/image/bmp.c | 2 +- content/handlers/image/gif.c | 4 ++-- content/handlers/image/ico.c | 4 ++-- content/handlers/image/image.c | 18 +++++++++--------- content/handlers/image/image_cache.c | 4 ++-- content/handlers/image/jpeg.c | 2 +- content/handlers/image/nssprite.c | 2 +- content/handlers/image/png.c | 4 ++-- content/handlers/image/rsvg.c | 2 +- content/handlers/image/svg.c | 2 +- content/handlers/image/video.c | 2 +- 11 files changed, 23 insertions(+), 23 deletions(-) (limited to 'content/handlers/image') diff --git a/content/handlers/image/bmp.c b/content/handlers/image/bmp.c index 8f787de37..e552cdf94 100644 --- a/content/handlers/image/bmp.c +++ b/content/handlers/image/bmp.c @@ -35,7 +35,7 @@ #include "content/content_protected.h" #include "desktop/gui_internal.h" -#include "bmp.h" +#include "image/bmp.h" /** bmp context. */ typedef struct nsbmp_content { diff --git a/content/handlers/image/gif.c b/content/handlers/image/gif.c index 2a8ce3d20..c4f039490 100644 --- a/content/handlers/image/gif.c +++ b/content/handlers/image/gif.c @@ -46,8 +46,8 @@ #include "content/content_protected.h" #include "desktop/gui_internal.h" -#include "image.h" -#include "gif.h" +#include "image/image.h" +#include "image/gif.h" typedef struct nsgif_content { struct content base; diff --git a/content/handlers/image/ico.c b/content/handlers/image/ico.c index 7b1e1271c..b14ea7fe1 100644 --- a/content/handlers/image/ico.c +++ b/content/handlers/image/ico.c @@ -33,8 +33,8 @@ #include "content/content_protected.h" #include "desktop/gui_internal.h" -#include "image.h" -#include "ico.h" +#include "image/image.h" +#include "image/ico.h" typedef struct nsico_content { struct content base; diff --git a/content/handlers/image/image.c b/content/handlers/image/image.c index 0b1ddc0e0..e7cc9218f 100644 --- a/content/handlers/image/image.c +++ b/content/handlers/image/image.c @@ -27,15 +27,15 @@ #include "netsurf/content.h" #include "desktop/gui_internal.h" -#include "bmp.h" -#include "gif.h" -#include "ico.h" -#include "jpeg.h" -#include "nssprite.h" -#include "png.h" -#include "rsvg.h" -#include "svg.h" -#include "image.h" +#include "image/bmp.h" +#include "image/gif.h" +#include "image/ico.h" +#include "image/jpeg.h" +#include "image/nssprite.h" +#include "image/png.h" +#include "image/rsvg.h" +#include "image/svg.h" +#include "image/image.h" /** * Initialise image content handlers diff --git a/content/handlers/image/image_cache.c b/content/handlers/image/image_cache.c index dcb01dd87..3eb27ac45 100644 --- a/content/handlers/image/image_cache.c +++ b/content/handlers/image/image_cache.c @@ -31,8 +31,8 @@ #include "content/content_protected.h" #include "desktop/gui_internal.h" -#include "image_cache.h" -#include "image.h" +#include "image/image_cache.h" +#include "image/image.h" /** Age of an entry within the cache * diff --git a/content/handlers/image/jpeg.c b/content/handlers/image/jpeg.c index e3af00f9f..278d9e618 100644 --- a/content/handlers/image/jpeg.c +++ b/content/handlers/image/jpeg.c @@ -35,7 +35,7 @@ #include "content/content_protected.h" #include "desktop/gui_internal.h" -#include "image_cache.h" +#include "image/image_cache.h" #define JPEG_INTERNAL_OPTIONS #include "jpeglib.h" diff --git a/content/handlers/image/nssprite.c b/content/handlers/image/nssprite.c index 9c4717fd6..c902fc3e2 100644 --- a/content/handlers/image/nssprite.c +++ b/content/handlers/image/nssprite.c @@ -35,7 +35,7 @@ #include "content/content_protected.h" #include "desktop/gui_internal.h" -#include "nssprite.h" +#include "image/nssprite.h" typedef struct nssprite_content { struct content base; diff --git a/content/handlers/image/png.c b/content/handlers/image/png.c index 45f415a6b..93185c12f 100644 --- a/content/handlers/image/png.c +++ b/content/handlers/image/png.c @@ -30,8 +30,8 @@ #include "content/content_protected.h" #include "desktop/gui_internal.h" -#include "image_cache.h" -#include "png.h" +#include "image/image_cache.h" +#include "image/png.h" /* accommodate for old versions of libpng (beware security holes!) */ diff --git a/content/handlers/image/rsvg.c b/content/handlers/image/rsvg.c index ad8e3fa17..1bf4b4403 100644 --- a/content/handlers/image/rsvg.c +++ b/content/handlers/image/rsvg.c @@ -48,7 +48,7 @@ #include "content/content_protected.h" #include "desktop/gui_internal.h" -#include "rsvg.h" +#include "image/rsvg.h" typedef struct rsvg_content { struct content base; diff --git a/content/handlers/image/svg.c b/content/handlers/image/svg.c index b4532646c..94c485822 100644 --- a/content/handlers/image/svg.c +++ b/content/handlers/image/svg.c @@ -33,7 +33,7 @@ #include "netsurf/content.h" #include "content/content_protected.h" -#include "svg.h" +#include "image/svg.h" typedef struct svg_content { struct content base; diff --git a/content/handlers/image/video.c b/content/handlers/image/video.c index 53b654337..707d39d9b 100644 --- a/content/handlers/image/video.c +++ b/content/handlers/image/video.c @@ -21,7 +21,7 @@ #include "content/content_factory.h" #include "content/content_protected.h" -#include "video.h" +#include "image/video.h" typedef struct nsvideo_content { struct content base; -- cgit v1.2.3