summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Sanders <vince@netsurf-browser.org>2014-01-29 23:20:19 +0000
committerVincent Sanders <vince@netsurf-browser.org>2014-01-29 23:20:19 +0000
commitd5a971c281b110d8fa481fa86ccd7af10d2d3cf0 (patch)
treecc2ce0759aa0d867fc5cb53aff970c11c8a80681
parente353973518839245edfb9c00d2fb9c6ef14032e8 (diff)
downloadnetsurf-d5a971c281b110d8fa481fa86ccd7af10d2d3cf0.tar.gz
netsurf-d5a971c281b110d8fa481fa86ccd7af10d2d3cf0.tar.bz2
move verbose log global into logging module and remove netsurf.h include
-rw-r--r--desktop/netsurf.c1
-rw-r--r--desktop/netsurf.h1
-rw-r--r--utils/log.c3
-rw-r--r--utils/log.h5
4 files changed, 6 insertions, 4 deletions
diff --git a/desktop/netsurf.c b/desktop/netsurf.c
index 76da91a89..c3653b574 100644
--- a/desktop/netsurf.c
+++ b/desktop/netsurf.c
@@ -73,7 +73,6 @@
#define HL_CACHE_CLEAN_TIME (2 * IMAGE_CACHE_CLEAN_TIME)
bool netsurf_quit = false;
-bool verbose_log = false;
static void netsurf_lwc_iterator(lwc_string *str, void *pw)
{
diff --git a/desktop/netsurf.h b/desktop/netsurf.h
index e6858ad66..77589c71c 100644
--- a/desktop/netsurf.h
+++ b/desktop/netsurf.h
@@ -23,7 +23,6 @@
#include "utils/errors.h"
extern bool netsurf_quit;
-extern bool verbose_log;
extern const char * const netsurf_version;
extern const int netsurf_version_major;
extern const int netsurf_version_minor;
diff --git a/utils/log.c b/utils/log.c
index 2aa39ee41..8ec42c1f7 100644
--- a/utils/log.c
+++ b/utils/log.c
@@ -23,10 +23,11 @@
#include <stdarg.h>
#include <stdio.h>
#include <sys/time.h>
-#include "desktop/netsurf.h"
#include "utils/log.h"
+bool verbose_log = false;
+
nserror nslog_init(nslog_ensure_t *ensure, int *pargc, char **argv)
{
nserror ret = NSERROR_OK;
diff --git a/utils/log.h b/utils/log.h
index ed953f37e..673419b66 100644
--- a/utils/log.h
+++ b/utils/log.h
@@ -21,9 +21,12 @@
#define _NETSURF_LOG_H_
#include <stdio.h>
-#include "desktop/netsurf.h"
+#include <stdbool.h>
+
#include "utils/errors.h"
+extern bool verbose_log;
+
/**
* Ensures the FILE handle is available to write logging to.
*