summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xamiga/schedule.c2
-rwxr-xr-xatari/schedule.c2
-rw-r--r--beos/beos_schedule.cpp1
-rw-r--r--content/fetchers/curl.c2
-rw-r--r--content/hlcache.c2
-rw-r--r--desktop/browser.c2
-rw-r--r--desktop/cookies.c4
-rw-r--r--framebuffer/gui.c4
-rw-r--r--framebuffer/schedule.c2
-rw-r--r--gtk/scaffolding.c1
-rw-r--r--gtk/schedule.c2
-rw-r--r--image/gif.c2
-rw-r--r--image/mng.c2
-rw-r--r--monkey/schedule.c2
-rw-r--r--render/html.c2
-rw-r--r--riscos/download.c1
-rw-r--r--riscos/gui/progress_bar.c1
-rw-r--r--riscos/gui/status_bar.c1
-rw-r--r--riscos/schedule.c2
-rw-r--r--utils/schedule.h (renamed from desktop/schedule.h)4
-rw-r--r--windows/schedule.c4
21 files changed, 25 insertions, 20 deletions
diff --git a/amiga/schedule.c b/amiga/schedule.c
index bc3ed0107..5d9061fec 100755
--- a/amiga/schedule.c
+++ b/amiga/schedule.c
@@ -16,7 +16,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "desktop/schedule.h"
+#include "utils/schedule.h"
#include "amiga/os3support.h"
#include "amiga/schedule.h"
diff --git a/atari/schedule.c b/atari/schedule.c
index 3556de768..17ea95dcd 100755
--- a/atari/schedule.c
+++ b/atari/schedule.c
@@ -19,7 +19,7 @@
#include <sys/time.h>
#include <time.h>
-#include "desktop/schedule.h"
+#include "utils/schedule.h"
#include "atari/schedule.h"
#include "utils/log.h"
diff --git a/beos/beos_schedule.cpp b/beos/beos_schedule.cpp
index ae0bce174..3f822352a 100644
--- a/beos/beos_schedule.cpp
+++ b/beos/beos_schedule.cpp
@@ -23,6 +23,7 @@
#include <List.h>
extern "C" {
+#include "utils/schedule.h"
#include "desktop/browser.h"
#ifdef DEBUG_BEOS_SCHEDULE
diff --git a/content/fetchers/curl.c b/content/fetchers/curl.c
index 8140aa64e..09709aca8 100644
--- a/content/fetchers/curl.c
+++ b/content/fetchers/curl.c
@@ -44,9 +44,9 @@
#include "content/urldb.h"
#include "desktop/netsurf.h"
#include "desktop/options.h"
-#include "desktop/schedule.h"
#include "utils/log.h"
#include "utils/messages.h"
+#include "utils/schedule.h"
#include "utils/url.h"
#include "utils/utils.h"
#include "utils/ring.h"
diff --git a/content/hlcache.c b/content/hlcache.c
index 3b8d0b27a..d1da79509 100644
--- a/content/hlcache.c
+++ b/content/hlcache.c
@@ -26,11 +26,11 @@
#include "content/content.h"
#include "content/hlcache.h"
-#include "desktop/schedule.h"
#include "utils/http.h"
#include "utils/log.h"
#include "utils/messages.h"
#include "utils/ring.h"
+#include "utils/schedule.h"
#include "utils/url.h"
#include "utils/utils.h"
diff --git a/desktop/browser.c b/desktop/browser.c
index 63b61de16..55c9682ab 100644
--- a/desktop/browser.c
+++ b/desktop/browser.c
@@ -51,7 +51,6 @@
#include "desktop/knockout.h"
#include "desktop/options.h"
#include "desktop/selection.h"
-#include "desktop/schedule.h"
#include "desktop/textinput.h"
#include "desktop/plotters.h"
@@ -60,6 +59,7 @@
#include "render/textplain.h"
#include "utils/log.h"
#include "utils/messages.h"
+#include "utils/schedule.h"
#include "utils/url.h"
#include "utils/utils.h"
#include "utils/utf8.h"
diff --git a/desktop/cookies.c b/desktop/cookies.c
index 4862b690e..bee0faf04 100644
--- a/desktop/cookies.c
+++ b/desktop/cookies.c
@@ -32,10 +32,10 @@
#include "content/urldb.h"
#include "desktop/cookies.h"
#include "desktop/options.h"
-#include "desktop/schedule.h"
#include "desktop/tree.h"
-#include "utils/messages.h"
#include "utils/log.h"
+#include "utils/messages.h"
+#include "utils/schedule.h"
#include "utils/url.h"
#include "utils/utils.h"
diff --git a/framebuffer/gui.c b/framebuffer/gui.c
index aa390666d..7838ab3ba 100644
--- a/framebuffer/gui.c
+++ b/framebuffer/gui.c
@@ -37,11 +37,11 @@
#include "desktop/netsurf.h"
#include "desktop/options.h"
#include "desktop/shape.h"
-#include "desktop/schedule.h"
#include "utils/resource.h"
#include "utils/log.h"
-#include "utils/url.h"
#include "utils/messages.h"
+#include "utils/schedule.h"
+#include "utils/url.h"
#include "utils/utils.h"
#include "desktop/textinput.h"
#include "render/form.h"
diff --git a/framebuffer/schedule.c b/framebuffer/schedule.c
index 63ef19c6c..185ebc837 100644
--- a/framebuffer/schedule.c
+++ b/framebuffer/schedule.c
@@ -20,7 +20,7 @@
#include <time.h>
#include <stdlib.h>
-#include "desktop/schedule.h"
+#include "utils/schedule.h"
#include "framebuffer/schedule.h"
#include "utils/log.h"
diff --git a/gtk/scaffolding.c b/gtk/scaffolding.c
index 439515fb5..96199d87b 100644
--- a/gtk/scaffolding.c
+++ b/gtk/scaffolding.c
@@ -82,6 +82,7 @@
#include "render/form.h"
#include "render/html.h"
#include "utils/messages.h"
+#include "utils/schedule.h"
#include "utils/utils.h"
#include "utils/url.h"
diff --git a/gtk/schedule.c b/gtk/schedule.c
index 8cf8563b1..5b168b689 100644
--- a/gtk/schedule.c
+++ b/gtk/schedule.c
@@ -20,7 +20,7 @@
#include <stdlib.h>
#include <stdbool.h>
-#include "desktop/schedule.h"
+#include "utils/schedule.h"
#include "gtk/schedule.h"
#ifdef DEBUG_GTK_SCHEDULE
diff --git a/image/gif.c b/image/gif.c
index 1863a2fef..e449db345 100644
--- a/image/gif.c
+++ b/image/gif.c
@@ -38,13 +38,13 @@
#include <libnsgif.h>
#include "utils/config.h"
#include "content/content_protected.h"
-#include "desktop/schedule.h"
#include "desktop/options.h"
#include "desktop/plotters.h"
#include "image/bitmap.h"
#include "image/gif.h"
#include "utils/log.h"
#include "utils/messages.h"
+#include "utils/schedule.h"
#include "utils/utils.h"
static void nsgif_invalidate(void *bitmap, void *private_word);
diff --git a/image/mng.c b/image/mng.c
index a4648e5a3..6067aa8e8 100644
--- a/image/mng.c
+++ b/image/mng.c
@@ -33,13 +33,13 @@
#include <sys/time.h>
#include <time.h>
#include <libmng.h>
-#include "desktop/schedule.h"
#include "desktop/options.h"
#include "desktop/plotters.h"
#include "image/bitmap.h"
#include "image/mng.h"
#include "utils/log.h"
#include "utils/messages.h"
+#include "utils/schedule.h"
#include "utils/utils.h"
/* We do not currently support any form of colour/gamma correction, nor do
diff --git a/monkey/schedule.c b/monkey/schedule.c
index 78051994b..dd789331c 100644
--- a/monkey/schedule.c
+++ b/monkey/schedule.c
@@ -20,7 +20,7 @@
#include <stdlib.h>
#include <stdbool.h>
-#include "desktop/schedule.h"
+#include "utils/schedule.h"
#include "gtk/schedule.h"
#undef DEBUG_MONKEY_SCHEDULE
diff --git a/render/html.c b/render/html.c
index 07232fca5..55acab8ca 100644
--- a/render/html.c
+++ b/render/html.c
@@ -34,7 +34,6 @@
#include "desktop/browser.h"
#include "desktop/gui.h"
#include "desktop/options.h"
-#include "desktop/schedule.h"
#include "image/bitmap.h"
#include "render/box.h"
#include "render/favicon.h"
@@ -46,6 +45,7 @@
#include "utils/http.h"
#include "utils/log.h"
#include "utils/messages.h"
+#include "utils/schedule.h"
#include "utils/talloc.h"
#include "utils/url.h"
#include "utils/utils.h"
diff --git a/riscos/download.c b/riscos/download.c
index cdcdebad7..e87436fe7 100644
--- a/riscos/download.c
+++ b/riscos/download.c
@@ -51,6 +51,7 @@
#include "riscos/wimp_event.h"
#include "utils/log.h"
#include "utils/messages.h"
+#include "utils/schedule.h"
#include "utils/url.h"
#include "utils/utf8.h"
#include "utils/utils.h"
diff --git a/riscos/gui/progress_bar.c b/riscos/gui/progress_bar.c
index b53fbf225..0afd7799e 100644
--- a/riscos/gui/progress_bar.c
+++ b/riscos/gui/progress_bar.c
@@ -31,6 +31,7 @@
#include "oslib/wimpspriteop.h"
#include "desktop/plotters.h"
#include "utils/log.h"
+#include "utils/schedule.h"
#include "utils/utils.h"
#include "riscos/gui.h"
#include "riscos/tinct.h"
diff --git a/riscos/gui/status_bar.c b/riscos/gui/status_bar.c
index d47bf8e97..1cd10e44c 100644
--- a/riscos/gui/status_bar.c
+++ b/riscos/gui/status_bar.c
@@ -30,6 +30,7 @@
#include "oslib/wimpspriteop.h"
#include "desktop/plotters.h"
#include "utils/log.h"
+#include "utils/schedule.h"
#include "utils/utils.h"
#include "riscos/gui.h"
#include "riscos/wimp.h"
diff --git a/riscos/schedule.c b/riscos/schedule.c
index fb8dce03a..257f2e72f 100644
--- a/riscos/schedule.c
+++ b/riscos/schedule.c
@@ -27,7 +27,7 @@
#include "oslib/os.h"
#include "riscos/gui.h"
#include "utils/log.h"
-#include "desktop/schedule.h"
+#include "utils/schedule.h"
/** Entry in the queue of scheduled callbacks. */
diff --git a/desktop/schedule.h b/utils/schedule.h
index 8d5aa1e90..b5fe386cc 100644
--- a/desktop/schedule.h
+++ b/utils/schedule.h
@@ -20,8 +20,8 @@
* Job scheduler (interface).
*/
-#ifndef _NETSURF_DESKTOP_SCHEDULE_H_
-#define _NETSURF_DESKTOP_SCHEDULE_H_
+#ifndef _NETSURF_UTILS_SCHEDULE_H_
+#define _NETSURF_UTILS_SCHEDULE_H_
/* In platform specific schedule.c. */
typedef void (*schedule_callback_fn)(void *p);
diff --git a/windows/schedule.c b/windows/schedule.c
index 559e0a395..3181c55e8 100644
--- a/windows/schedule.c
+++ b/windows/schedule.c
@@ -19,8 +19,8 @@
#include <sys/time.h>
#include <time.h>
-#include "desktop/schedule.h"
-#include "framebuffer/schedule.h"
+#include "utils/schedule.h"
+#include "windows/schedule.h"
#include "utils/log.h"
#include "utils/utils.h"