diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2017-01-14 19:58:54 +0000 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2017-01-14 19:58:54 +0000 |
| commit | 9f10babe645fe67b02fae90f852d5e4cdfcbb70e (patch) | |
| tree | 909b77e3c48418204a23ac4723684ca0bc76a081 /frontends/framebuffer | |
| parent | 0d9023148d2a34bd908aac38e44d449359b03438 (diff) | |
| parent | 7dab7cb43d4091648ceb40684ff70aff7091c648 (diff) | |
| download | netsurf-9f10babe645fe67b02fae90f852d5e4cdfcbb70e.tar.gz netsurf-9f10babe645fe67b02fae90f852d5e4cdfcbb70e.tar.bz2 | |
Merge branch 'master' of git://git.netsurf-browser.org/netsurf into chris/menuclass
Diffstat (limited to 'frontends/framebuffer')
| -rw-r--r-- | frontends/framebuffer/convert_image.c | 2 | ||||
| -rw-r--r-- | frontends/framebuffer/fbtk.h | 2 | ||||
| -rw-r--r-- | frontends/framebuffer/fbtk/user.c | 1 | ||||
| -rw-r--r-- | frontends/framebuffer/font_freetype.c | 1 | ||||
| -rw-r--r-- | frontends/framebuffer/font_internal.c | 1 |
5 files changed, 4 insertions, 3 deletions
diff --git a/frontends/framebuffer/convert_image.c b/frontends/framebuffer/convert_image.c index 2608328ff..de772fc29 100644 --- a/frontends/framebuffer/convert_image.c +++ b/frontends/framebuffer/convert_image.c @@ -262,7 +262,7 @@ main(int argc, char **argv) fprintf(f, "#include <stdint.h>\n\n"); fprintf(f, "#include <stdbool.h>\n\n"); fprintf(f, "#include <libnsfb.h>\n\n"); - fprintf(f, "#include \"desktop/plot_style.h\"\n"); + fprintf(f, "#include \"netsurf/plot_style.h\"\n"); fprintf(f, "#include \"framebuffer/gui.h\"\n"); fprintf(f, "#include \"framebuffer/fbtk.h\"\n\n"); diff --git a/frontends/framebuffer/fbtk.h b/frontends/framebuffer/fbtk.h index fe4f5a564..3cc326cef 100644 --- a/frontends/framebuffer/fbtk.h +++ b/frontends/framebuffer/fbtk.h @@ -19,7 +19,7 @@ #ifndef NETSURF_FB_FBTK_H #define NETSURF_FB_FBTK_H -#include "desktop/plot_style.h" +#include "netsurf/types.h" #ifdef FBTK_LOGGING #define FBTK_LOG(x) LOG(x) diff --git a/frontends/framebuffer/fbtk/user.c b/frontends/framebuffer/fbtk/user.c index 2b9cc8768..de547ab46 100644 --- a/frontends/framebuffer/fbtk/user.c +++ b/frontends/framebuffer/fbtk/user.c @@ -22,7 +22,6 @@ #include <stdbool.h> #include <libnsfb.h> -#include "desktop/plot_style.h" #include "framebuffer/gui.h" #include "framebuffer/fbtk.h" diff --git a/frontends/framebuffer/font_freetype.c b/frontends/framebuffer/font_freetype.c index 323982014..ccc60ea47 100644 --- a/frontends/framebuffer/font_freetype.c +++ b/frontends/framebuffer/font_freetype.c @@ -30,6 +30,7 @@ #include "netsurf/utf8.h" #include "netsurf/layout.h" #include "netsurf/browser_window.h" +#include "netsurf/plot_style.h" #include "framebuffer/gui.h" #include "framebuffer/font.h" diff --git a/frontends/framebuffer/font_internal.c b/frontends/framebuffer/font_internal.c index 3fd3ac6ef..3b8a1c43f 100644 --- a/frontends/framebuffer/font_internal.c +++ b/frontends/framebuffer/font_internal.c @@ -26,6 +26,7 @@ #include "utils/utf8.h" #include "netsurf/utf8.h" #include "netsurf/layout.h" +#include "netsurf/plot_style.h" #include "framebuffer/gui.h" #include "framebuffer/font.h" |