summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorVincent Sanders <vince@kyllikki.org>2016-05-30 11:51:10 +0100
committerVincent Sanders <vince@kyllikki.org>2016-05-30 11:51:10 +0100
commitc041393e66b4a75cfc1165e184be77cc974a63cb (patch)
tree6e57207a4e8d8b4eee3d28be9fc40b3a0f78622a /desktop
parent9ce71876ce500e242e2384c21abb38a8f431138b (diff)
downloadnetsurf-c041393e66b4a75cfc1165e184be77cc974a63cb.tar.gz
netsurf-c041393e66b4a75cfc1165e184be77cc974a63cb.tar.bz2
move netsurf header into public API
Diffstat (limited to 'desktop')
-rw-r--r--desktop/gui_factory.c4
-rw-r--r--desktop/netsurf.c4
-rw-r--r--desktop/netsurf.h53
3 files changed, 4 insertions, 57 deletions
diff --git a/desktop/gui_factory.c b/desktop/gui_factory.c
index a085c0ca8..cecbe6e79 100644
--- a/desktop/gui_factory.c
+++ b/desktop/gui_factory.c
@@ -38,7 +38,7 @@
#include "netsurf/clipboard.h"
#include "netsurf/utf8.h"
#include "netsurf/layout.h"
-#include "desktop/netsurf.h"
+#include "netsurf/netsurf.h"
/**
* The global interface table.
@@ -743,7 +743,7 @@ static nserror verify_misc_register(struct gui_misc_table *gmt)
}
-/* exported interface documented in desktop/netsurf.h */
+/* exported interface documented in netsurf/netsurf.h */
nserror netsurf_register(struct netsurf_table *gt)
{
nserror err;
diff --git a/desktop/netsurf.c b/desktop/netsurf.c
index 8e763ca05..fd4cacf9e 100644
--- a/desktop/netsurf.c
+++ b/desktop/netsurf.c
@@ -49,7 +49,7 @@
#include "desktop/searchweb.h"
#include "netsurf/misc.h"
#include "desktop/gui_internal.h"
-#include "desktop/netsurf.h"
+#include "netsurf/netsurf.h"
/** speculative pre-conversion small image size
*
@@ -121,7 +121,7 @@ static nserror netsurf_llcache_query_handler(const llcache_query *query,
return NSERROR_OK;
}
-/* exported interface documented in desktop/netsurf.h */
+/* exported interface documented in netsurf/netsurf.h */
nserror netsurf_init(const char *store_path)
{
nserror ret;
diff --git a/desktop/netsurf.h b/desktop/netsurf.h
deleted file mode 100644
index ee6e53a7f..000000000
--- a/desktop/netsurf.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright 2014 Vincent Sanders <vince@netsurf-browser.org>
- *
- * This file is part of NetSurf, http://www.netsurf-browser.org/
- *
- * NetSurf is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * NetSurf is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * \file
- *
- * NetSurf core interface registration, construction and destruction.
- */
-
-#ifndef _NETSURF_DESKTOP_NETSURF_H_
-#define _NETSURF_DESKTOP_NETSURF_H_
-
-#include "utils/errors.h"
-#include "desktop/gui_table.h"
-
-/**
- * Register operation table.
- *
- * @param table NetSurf operations table.
- * @return NSERROR_OK on success or error code on faliure. On faliure
- * global table will not be initialised.
- */
-nserror netsurf_register(struct netsurf_table *table);
-
-/**
- * Initialise netsurf core.
- *
- * @param store_path path to persistant storage.
- * @return NSERROR_OK on success or error code on faliure.
- */
-nserror netsurf_init(const char *store_path);
-
-/**
- * Finalise NetSurf core
- */
-extern void netsurf_exit(void);
-
-#endif