Move port for kolibrios ahead.

Look at diff from master and reconcile.

1 files changed, 20 insertions, 4 deletions

diff --git a/content/fetch.c b/content/fetch.c
index 37b28106b..598ac8dd7 100644
--- a/content/fetch.c
+++ b/content/fetch.c
@@ -54,16 +54,27 @@
 #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 */
+#define DEBUG_FETCH_VERBOSE
+
+/** Verbose fetcher logging */
+#ifdef DEBUG_FETCH_VERBOSE
+#define FETCH_LOG(x...) debug_board_printf(x); debug_board_printf("\n");
+#else
+#define FETCH_LOG(x...)
+#endif
+
 /** The maximum number of fetchers that can be added */
 #define MAX_FETCHERS 10
 
@@ -296,7 +307,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;