summaryrefslogtreecommitdiff
path: root/framebuffer
diff options
context:
space:
mode:
authorVincent Sanders <vince@netsurf-browser.org>2013-05-25 22:46:27 +0100
committerVincent Sanders <vince@netsurf-browser.org>2013-05-28 14:16:10 +0100
commitee6e6eec050a38d9e795df86fa7a45ca313f8845 (patch)
treec9f2431d8865e7a0b6483912b1192a324600ec7e /framebuffer
parenta5355ec55721b6d874168d979338044c4a12dc52 (diff)
downloadnetsurf-ee6e6eec050a38d9e795df86fa7a45ca313f8845.tar.gz
netsurf-ee6e6eec050a38d9e795df86fa7a45ca313f8845.tar.bz2
move options include
Diffstat (limited to 'framebuffer')
-rw-r--r--framebuffer/font_freetype.c2
-rw-r--r--framebuffer/font_internal.c2
-rw-r--r--framebuffer/gui.c4
-rw-r--r--framebuffer/localhistory.c2
-rw-r--r--framebuffer/system_colour.c2
5 files changed, 6 insertions, 6 deletions
diff --git a/framebuffer/font_freetype.c b/framebuffer/font_freetype.c
index 987b101c7..87751a39d 100644
--- a/framebuffer/font_freetype.c
+++ b/framebuffer/font_freetype.c
@@ -29,7 +29,7 @@
#include "utils/filepath.h"
#include "utils/utf8.h"
#include "utils/log.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
#include "framebuffer/gui.h"
#include "framebuffer/font.h"
diff --git a/framebuffer/font_internal.c b/framebuffer/font_internal.c
index ff2bfa1ef..60f1b8e5a 100644
--- a/framebuffer/font_internal.c
+++ b/framebuffer/font_internal.c
@@ -23,7 +23,7 @@
#include <assert.h>
#include "css/css.h"
#include "render/font.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
#include "utils/utf8.h"
#include "framebuffer/gui.h"
diff --git a/framebuffer/gui.c b/framebuffer/gui.c
index 4277557b4..7e2ff2bc1 100644
--- a/framebuffer/gui.c
+++ b/framebuffer/gui.c
@@ -36,7 +36,7 @@
#include "desktop/mouse.h"
#include "desktop/plotters.h"
#include "desktop/netsurf.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
#include "utils/filepath.h"
#include "utils/log.h"
#include "utils/messages.h"
@@ -476,7 +476,7 @@ process_cmdline(int argc, char** argv)
return true;
}
-/* Documented in desktop/options.h */
+/* Documented in utils/nsoption.h */
void gui_options_init_defaults(void)
{
/* Set defaults for absent option strings */
diff --git a/framebuffer/localhistory.c b/framebuffer/localhistory.c
index f6c24a1a4..e23dd1f99 100644
--- a/framebuffer/localhistory.c
+++ b/framebuffer/localhistory.c
@@ -35,7 +35,7 @@
#include "desktop/gui.h"
#include "desktop/plotters.h"
#include "desktop/netsurf.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
#include "utils/log.h"
#include "utils/url.h"
#include "utils/messages.h"
diff --git a/framebuffer/system_colour.c b/framebuffer/system_colour.c
index 18b25eee3..139cd4780 100644
--- a/framebuffer/system_colour.c
+++ b/framebuffer/system_colour.c
@@ -24,7 +24,7 @@
#include "utils/utils.h"
#include "utils/log.h"
#include "desktop/gui.h"
-#include "desktop/options.h"
+#include "utils/nsoption.h"
struct gui_system_colour_ctx {
const char *name;