diff options
| author | Ashish Gupta <ashmew2@gmail.com> | 2017-04-21 23:18:15 +0200 |
|---|---|---|
| committer | Ashish Gupta <ashmew2@gmail.com> | 2017-06-10 08:25:29 +0200 |
| commit | dbe64238302aab07de75d520f9a85fa2856e8ce7 (patch) | |
| tree | 7380272e351b5f146c9331a712978c95502434f6 /content | |
| parent | efdd93541042bcae19fb09d56d2a0a61252d0fd2 (diff) | |
| download | netsurf-dbe64238302aab07de75d520f9a85fa2856e8ce7.tar.gz netsurf-dbe64238302aab07de75d520f9a85fa2856e8ce7.tar.bz2 | |
Move port for kolibrios ahead.
Look at diff from master and reconcile.
Diffstat (limited to 'content')
| -rw-r--r-- | content/fetch.c | 18 | ||||
| -rw-r--r-- | content/fetchers/Makefile | 1 |
2 files changed, 13 insertions, 6 deletions
diff --git a/content/fetch.c b/content/fetch.c index bfc84ea6a..666b9e30e 100644 --- a/content/fetch.c +++ b/content/fetch.c @@ -54,22 +54,23 @@ #include "content/fetchers.h" #include "content/fetchers/resource.h" #include "content/fetchers/about.h" -#if defined(_TARGET_IS_KOLIBRIOS) -#include "content/fetchers/http_kolibri.h" -#else +#ifdef WITH_CURL #include "content/fetchers/curl.h" #endif +#if defined(_TARGET_IS_KOLIBRIOS) +#include "content/fetchers/httplib_kolibri.h" +#endif #include "content/fetchers/data.h" #include "content/fetchers/file.h" #include "javascript/fetcher.h" #include "content/urldb.h" /* Define this to turn on verbose fetch logging */ -#undef DEBUG_FETCH_VERBOSE +#define DEBUG_FETCH_VERBOSE /** Verbose fetcher logging */ #ifdef DEBUG_FETCH_VERBOSE -#define FETCH_LOG(x...) LOG(x...) +#define FETCH_LOG(x...) debug_board_printf(x); debug_board_printf("\n"); #else #define FETCH_LOG(x...) #endif @@ -299,7 +300,12 @@ nserror fetcher_init(void) return ret; } #endif - +#ifdef _TARGET_IS_KOLIBRIOS + ret = fetch_httplib_kolibri_register(); + if (ret != NSERROR_OK) { + return ret; + } +#endif ret = fetch_data_register(); if (ret != NSERROR_OK) { return ret; diff --git a/content/fetchers/Makefile b/content/fetchers/Makefile index 9c8479320..5d9b7ad00 100644 --- a/content/fetchers/Makefile +++ b/content/fetchers/Makefile @@ -3,6 +3,7 @@ S_FETCHERS_YES := data.c file.c about.c resource.c S_FETCHERS_NO := S_FETCHERS_$(NETSURF_USE_CURL) += curl.c +S_FETCHERS_$(NETSURF_USE_KOLIBRI_HTTPLIB) += httplib_kolibri.c S_FETCHERS := $(addprefix content/fetchers/,$(S_FETCHERS_YES)) |