diff options
| -rw-r--r-- | desktop/browser.h | 2 | ||||
| -rw-r--r-- | desktop/plotters.h | 2 | ||||
| -rw-r--r-- | framebuffer/gui.c | 2 | ||||
| -rw-r--r-- | render/box.h | 2 | ||||
| -rw-r--r-- | riscos/save_draw.c | 2 | ||||
| -rw-r--r-- | utils/types.h (renamed from desktop/shape.h) | 6 |
6 files changed, 8 insertions, 8 deletions
diff --git a/desktop/browser.h b/desktop/browser.h index c1f07db09..6a313f032 100644 --- a/desktop/browser.h +++ b/desktop/browser.h @@ -31,8 +31,8 @@ #include "content/content.h" #include "desktop/gui.h" #include "desktop/mouse.h" -#include "desktop/shape.h" #include "render/html.h" +#include "utils/types.h" struct box; struct hlcache_handle; diff --git a/desktop/plotters.h b/desktop/plotters.h index 02735a15f..ff5e8a9c7 100644 --- a/desktop/plotters.h +++ b/desktop/plotters.h @@ -27,7 +27,7 @@ #include "css/css.h" #include "content/content.h" #include "desktop/plot_style.h" -#include "desktop/shape.h" +#include "utils/types.h" struct bitmap; diff --git a/framebuffer/gui.c b/framebuffer/gui.c index 4df9d5bf8..7df3a9173 100644 --- a/framebuffer/gui.c +++ b/framebuffer/gui.c @@ -36,11 +36,11 @@ #include "desktop/plotters.h" #include "desktop/netsurf.h" #include "desktop/options.h" -#include "desktop/shape.h" #include "utils/filepath.h" #include "utils/log.h" #include "utils/messages.h" #include "utils/schedule.h" +#include "utils/types.h" #include "utils/url.h" #include "utils/utils.h" #include "desktop/textinput.h" diff --git a/render/box.h b/render/box.h index 9c8161373..28dd007da 100644 --- a/render/box.h +++ b/render/box.h @@ -92,8 +92,8 @@ #include <libxml/HTMLparser.h> #include "desktop/browser.h" -#include "desktop/shape.h" #include "css/css.h" +#include "utils/types.h" struct box; struct column; diff --git a/riscos/save_draw.c b/riscos/save_draw.c index dcc0af5fa..63730bd00 100644 --- a/riscos/save_draw.c +++ b/riscos/save_draw.c @@ -32,11 +32,11 @@ #include "content/content.h" #include "content/hlcache.h" #include "desktop/plotters.h" -#include "desktop/shape.h" #include "riscos/bitmap.h" #include "riscos/gui.h" #include "riscos/save_draw.h" #include "utils/log.h" +#include "utils/types.h" #include "utils/utils.h" static bool ro_save_draw_rectangle(int x0, int y0, int x1, int y1, const plot_style_t *style); diff --git a/desktop/shape.h b/utils/types.h index 5baf629b6..40427b658 100644 --- a/desktop/shape.h +++ b/utils/types.h @@ -17,11 +17,11 @@ */ /** \file - * Core shapes. + * Core types. */ -#ifndef _NETSURF_DESKTOP_SHAPE_H_ -#define _NETSURF_DESKTOP_SHAPE_H_ +#ifndef _NETSURF_UTILS_TYPES_H_ +#define _NETSURF_UTILS_TYPES_H_ /* Rectangle coordinates */ struct rect { |