From 7d9c9dba3610bb14c0de6acb1bdaf9ec49a66f33 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Thu, 21 Apr 2016 22:36:21 +0100 Subject: Split utils header into string functions and everything else split out the string handling API from the rest of the utils header and fix up all the fallout. --- amiga/download.c | 1 + amiga/misc.c | 1 + amiga/theme.c | 1 + amiga/tree.c | 1 + atari/download.c | 1 + atari/file.c | 1 + beos/download.cpp | 1 + content/fetch.c | 1 + content/fetchers/about.c | 32 ++++-------- content/fetchers/curl.c | 1 + content/fetchers/data.c | 26 +++++----- content/fetchers/file.c | 12 +---- content/fetchers/resource.c | 17 +------ framebuffer/fbtk/fbtk.c | 1 + gtk/about.c | 1 + gtk/download.c | 1 + gtk/history.c | 1 + gtk/preferences.c | 1 + gtk/toolbar.c | 1 + gtk/treeview.c | 1 + gtk/viewsource.c | 1 + gtk/window.c | 1 + javascript/fetcher.c | 27 ++--------- monkey/browser.c | 1 + render/box_construct.c | 13 ++--- render/html.c | 1 + riscos/download.c | 1 + riscos/image.c | 1 + riscos/textselection.c | 5 +- riscos/ucstables.c | 1 + riscos/url_protocol.c | 5 +- riscos/window.c | 1 + utils/file.c | 1 + utils/messages.c | 1 + utils/string.h | 115 ++++++++++++++++++++++++++++++++++++++++++++ utils/url.c | 2 +- utils/utils.c | 1 + utils/utils.h | 85 -------------------------------- windows/download.c | 1 + windows/file.c | 1 + windows/schedule.c | 1 + 41 files changed, 187 insertions(+), 182 deletions(-) create mode 100644 utils/string.h diff --git a/amiga/download.c b/amiga/download.c index fc58bd48e..21c21cade 100644 --- a/amiga/download.c +++ b/amiga/download.c @@ -47,6 +47,7 @@ #include "utils/messages.h" #include "utils/utils.h" #include "utils/nsoption.h" +#include "utils/string.h" #include "desktop/download.h" #include "desktop/save_complete.h" #include "desktop/browser.h" diff --git a/amiga/misc.c b/amiga/misc.c index ae91bf3b2..dc87ae994 100755 --- a/amiga/misc.c +++ b/amiga/misc.c @@ -16,6 +16,7 @@ * along with this program. If not, see . */ +#include #include #include diff --git a/amiga/theme.c b/amiga/theme.c index 97b6bab4f..399a11663 100644 --- a/amiga/theme.c +++ b/amiga/theme.c @@ -18,6 +18,7 @@ #include "amiga/os3support.h" +#include #include #include diff --git a/amiga/tree.c b/amiga/tree.c index fd0a5a61e..48b152199 100644 --- a/amiga/tree.c +++ b/amiga/tree.c @@ -18,6 +18,7 @@ #include "amiga/os3support.h" +#include #include #include #include diff --git a/atari/download.c b/atari/download.c index c6f1d684b..dad5d1f76 100644 --- a/atari/download.c +++ b/atari/download.c @@ -29,6 +29,7 @@ #include "utils/messages.h" #include "utils/utils.h" #include "utils/nsoption.h" +#include "utils/string.h" #include "content/urldb.h" #include "content/fetch.h" #include "desktop/save_complete.h" diff --git a/atari/file.c b/atari/file.c index b6d465f91..499edd627 100644 --- a/atari/file.c +++ b/atari/file.c @@ -29,6 +29,7 @@ #include "utils/url.h" #include "utils/nsurl.h" #include "utils/file.h" +#include "utils/string.h" /** * \file diff --git a/beos/download.cpp b/beos/download.cpp index 791da3558..6145caf0c 100644 --- a/beos/download.cpp +++ b/beos/download.cpp @@ -24,6 +24,7 @@ extern "C" { #include "desktop/download.h" #include "desktop/gui_download.h" #include "utils/utils.h" +#include "utils/string.h" } #include "beos/download.h" diff --git a/content/fetch.c b/content/fetch.c index 415ca2651..9c2933b56 100644 --- a/content/fetch.c +++ b/content/fetch.c @@ -31,6 +31,7 @@ * fetches are stored in the ::queue_ring waiting for use. */ +#include #include #include #include diff --git a/content/fetchers/about.c b/content/fetchers/about.c index cf66a622b..605d3a8d9 100644 --- a/content/fetchers/about.c +++ b/content/fetchers/about.c @@ -16,7 +16,8 @@ * along with this program. If not, see . */ -/** \file content/fetchers/about.c +/** + * \file * * URL handling for the "about" scheme. * @@ -25,39 +26,24 @@ * information from the browser from a known, fixed URL. */ -#include -#include -#include -#include -#include -#include -#include -#include +#include #include -#include -#include #include -#include #include -#include - #include "testament.h" +#include "utils/corestrings.h" +#include "utils/nsoption.h" +#include "utils/utils.h" +#include "utils/ring.h" -#include "utils/config.h" -#include "utils/dirent.h" #include "content/fetch.h" #include "content/fetchers.h" #include "content/fetchers/about.h" -#include "content/urldb.h" -#include "utils/nsoption.h" -#include "utils/corestrings.h" -#include "utils/log.h" -#include "utils/messages.h" -#include "utils/utils.h" -#include "utils/ring.h" +#include "content/content_type.h" #include "image/image_cache.h" + struct fetch_about_context; typedef bool (*fetch_about_handler)(struct fetch_about_context *); diff --git a/content/fetchers/curl.c b/content/fetchers/curl.c index 07b13d543..7b9c5f0d7 100644 --- a/content/fetchers/curl.c +++ b/content/fetchers/curl.c @@ -51,6 +51,7 @@ #include "utils/ring.h" #include "utils/useragent.h" #include "utils/file.h" +#include "utils/string.h" #include "desktop/gui_fetch.h" #include "desktop/gui_internal.h" diff --git a/content/fetchers/data.c b/content/fetchers/data.c index 6c18911e2..84d0aa3fa 100644 --- a/content/fetchers/data.c +++ b/content/fetchers/data.c @@ -16,32 +16,28 @@ * along with this program. If not, see . */ -/* data: URL handling. See http://tools.ietf.org/html/rfc2397 */ +/** + * \file + * data scheme handling. See http://tools.ietf.org/html/rfc2397 + */ -#include -#include #include #include -#include -#include - -#include /* for URL unescaping functions */ - +#include +#include /* for URL unescaping functions */ #include -#include "utils/config.h" -#include "content/fetch.h" -#include "content/fetchers.h" -#include "content/fetchers/data.h" -#include "content/urldb.h" +#include "utils/nsurl.h" #include "utils/corestrings.h" -#include "utils/nsoption.h" #include "utils/log.h" -#include "utils/messages.h" #include "utils/utils.h" #include "utils/ring.h" #include "utils/base64.h" +#include "content/fetch.h" +#include "content/fetchers.h" +#include "content/fetchers/data.h" + struct fetch_data_context { struct fetch *parent_fetch; char *url; diff --git a/content/fetchers/file.c b/content/fetchers/file.c index d13b4d56a..2e3411ac1 100644 --- a/content/fetchers/file.c +++ b/content/fetchers/file.c @@ -24,33 +24,26 @@ #include "utils/config.h" +#include #include #include #include #include #include -#include #include #include -#include #include -#include #include #include -#include #include - #ifdef HAVE_MMAP #include #endif - #include +#include "utils/nsurl.h" #include "utils/dirent.h" #include "utils/corestrings.h" -#include "utils/nsoption.h" -#include "utils/errors.h" -#include "utils/log.h" #include "utils/messages.h" #include "utils/utils.h" #include "utils/ring.h" @@ -61,7 +54,6 @@ #include "content/dirlist.h" #include "content/fetch.h" #include "content/fetchers.h" -#include "content/urldb.h" #include "content/fetchers/file.h" /* Maximum size of read buffer */ diff --git a/content/fetchers/resource.c b/content/fetchers/resource.c index 2db414d68..4dfac5c6a 100644 --- a/content/fetchers/resource.c +++ b/content/fetchers/resource.c @@ -21,27 +21,15 @@ * resource scheme URL handling. Based on the data fetcher by Rob Kendrick */ -#include -#include -#include -#include -#include -#include +#include #include -#include #include -#include -#include #include -#include #include - #include -#include "utils/dirent.h" -#include "utils/errors.h" +#include "utils/nsurl.h" #include "utils/corestrings.h" -#include "utils/nsoption.h" #include "utils/log.h" #include "utils/messages.h" #include "utils/utils.h" @@ -52,7 +40,6 @@ #include "content/fetch.h" #include "content/fetchers.h" #include "content/fetchers/resource.h" -#include "content/urldb.h" #define DIRECT_ETAG_VALUE 123456 diff --git a/framebuffer/fbtk/fbtk.c b/framebuffer/fbtk/fbtk.c index 882e5e5f2..db1c1f1a9 100644 --- a/framebuffer/fbtk/fbtk.c +++ b/framebuffer/fbtk/fbtk.c @@ -18,6 +18,7 @@ * along with this program. If not, see . */ +#include #include #include #include diff --git a/gtk/about.c b/gtk/about.c index b2f5a52cd..55df409c8 100644 --- a/gtk/about.c +++ b/gtk/about.c @@ -22,6 +22,7 @@ * Implementation of gtk about dialog. */ +#include #include #include "utils/utils.h" diff --git a/gtk/download.c b/gtk/download.c index 23832ded9..195f68952 100644 --- a/gtk/download.c +++ b/gtk/download.c @@ -28,6 +28,7 @@ #include "utils/nsurl.h" #include "utils/messages.h" #include "utils/nsoption.h" +#include "utils/string.h" #include "desktop/download.h" #include "desktop/gui_download.h" diff --git a/gtk/history.c b/gtk/history.c index db30c5b66..2f11042aa 100644 --- a/gtk/history.c +++ b/gtk/history.c @@ -17,6 +17,7 @@ * along with this program. If not, see . */ +#include #include #include "utils/log.h" diff --git a/gtk/preferences.c b/gtk/preferences.c index 5e7c3c555..0f385066b 100644 --- a/gtk/preferences.c +++ b/gtk/preferences.c @@ -16,6 +16,7 @@ * along with this program. If not, see . */ +#include #include #include #include diff --git a/gtk/toolbar.c b/gtk/toolbar.c index 801259812..cb01e1aa3 100644 --- a/gtk/toolbar.c +++ b/gtk/toolbar.c @@ -16,6 +16,7 @@ * along with this program. If not, see . */ +#include #include #include #include diff --git a/gtk/treeview.c b/gtk/treeview.c index 2b2e6c781..08f1d9ee9 100644 --- a/gtk/treeview.c +++ b/gtk/treeview.c @@ -21,6 +21,7 @@ * Generic tree handling (implementation). */ +#include #include #include #include diff --git a/gtk/viewsource.c b/gtk/viewsource.c index 62e595900..554cfbf39 100644 --- a/gtk/viewsource.c +++ b/gtk/viewsource.c @@ -16,6 +16,7 @@ * along with this program. If not, see . */ +#include #include #include "utils/utils.h" diff --git a/gtk/window.c b/gtk/window.c index c50ed20fe..14aa34e30 100644 --- a/gtk/window.c +++ b/gtk/window.c @@ -22,6 +22,7 @@ * Implementation of gtk windowing. */ +#include #include #include #include diff --git a/javascript/fetcher.c b/javascript/fetcher.c index 5bbe3dd9f..839df265a 100644 --- a/javascript/fetcher.c +++ b/javascript/fetcher.c @@ -22,36 +22,17 @@ * This fetcher implements http://www.whatwg.org/specs/web-apps/current-work/multipage/browsers.html#javascript-protocol */ -#include -#include -#include -#include -#include -#include #include -#include -#include -#include -#include -#include -#include -#include - +#include #include -#include "utils/config.h" -#include "utils/errors.h" +#include "utils/nsurl.h" #include "utils/corestrings.h" -#include "utils/nsoption.h" -#include "utils/log.h" -#include "utils/messages.h" -#include "utils/utils.h" #include "utils/ring.h" - #include "content/fetch.h" #include "content/fetchers.h" + #include "javascript/fetcher.h" -#include "content/urldb.h" /** Context for an resource fetch */ struct fetch_javascript_context { @@ -62,7 +43,7 @@ struct fetch_javascript_context { bool aborted; /**< Flag indicating fetch has been aborted */ bool locked; /**< Flag indicating entry is already entered */ - nsurl *url; + nsurl *url; /**< The URL being fetched */ }; static struct fetch_javascript_context *ring = NULL; diff --git a/monkey/browser.c b/monkey/browser.c index 2b007fde6..85b3c62ed 100644 --- a/monkey/browser.c +++ b/monkey/browser.c @@ -19,6 +19,7 @@ /* Browser-related callbacks */ #include +#include #include "utils/utils.h" #include "utils/ring.h" diff --git a/render/box_construct.c b/render/box_construct.c index 23d41203f..7e982d7a3 100644 --- a/render/box_construct.c +++ b/render/box_construct.c @@ -22,7 +22,7 @@ /** * \file - * Conversion of XML tree to box tree (implementation). + * Implementation of conversion from DOM tree to box tree. */ #include @@ -34,11 +34,6 @@ #include #include "utils/config.h" -#include "content/content_protected.h" -#include "css/css.h" -#include "css/hints.h" -#include "css/select.h" -#include "css/utils.h" #include "utils/nsoption.h" #include "utils/corestrings.h" #include "utils/locale.h" @@ -46,6 +41,12 @@ #include "utils/messages.h" #include "utils/talloc.h" #include "utils/utils.h" +#include "utils/string.h" +#include "content/content_protected.h" +#include "css/css.h" +#include "css/hints.h" +#include "css/select.h" +#include "css/utils.h" #include "desktop/gui_misc.h" #include "desktop/gui_internal.h" diff --git a/render/html.c b/render/html.c index fb4c05b0d..c95044f29 100644 --- a/render/html.c +++ b/render/html.c @@ -39,6 +39,7 @@ #include "utils/talloc.h" #include "utils/utf8.h" #include "utils/nsoption.h" +#include "utils/string.h" #include "content/content_protected.h" #include "content/fetch.h" #include "content/hlcache.h" diff --git a/riscos/download.c b/riscos/download.c index 851f0aecc..cf4f8f475 100644 --- a/riscos/download.c +++ b/riscos/download.c @@ -52,6 +52,7 @@ #include "utils/nsurl.h" #include "utils/utf8.h" #include "utils/utils.h" +#include "utils/string.h" #include "utils/corestrings.h" #include "desktop/gui_download.h" #include "desktop/download.h" diff --git a/riscos/image.c b/riscos/image.c index 63e65f27b..3f23691a4 100644 --- a/riscos/image.c +++ b/riscos/image.c @@ -18,6 +18,7 @@ #include #include +#include #include #include diff --git a/riscos/textselection.c b/riscos/textselection.c index dc852a79c..38a33ef74 100644 --- a/riscos/textselection.c +++ b/riscos/textselection.c @@ -23,8 +23,9 @@ #include #include #include -#include "oslib/osfile.h" -#include "oslib/wimp.h" +#include +#include +#include #include "utils/log.h" #include "utils/utf8.h" diff --git a/riscos/ucstables.c b/riscos/ucstables.c index c881437ca..7ac685df2 100644 --- a/riscos/ucstables.c +++ b/riscos/ucstables.c @@ -23,6 +23,7 @@ #include #include #include +#include #include #include diff --git a/riscos/url_protocol.c b/riscos/url_protocol.c index 9fa888269..34c281444 100644 --- a/riscos/url_protocol.c +++ b/riscos/url_protocol.c @@ -29,8 +29,9 @@ #include #include #include -#include "oslib/inetsuite.h" -#include "oslib/wimp.h" +#include +#include +#include #include "utils/log.h" #include "utils/messages.h" diff --git a/riscos/window.c b/riscos/window.c index 61457073a..acf51c546 100644 --- a/riscos/window.c +++ b/riscos/window.c @@ -51,6 +51,7 @@ #include "utils/utf8.h" #include "utils/utils.h" #include "utils/messages.h" +#include "utils/string.h" #include "content/content.h" #include "content/hlcache.h" #include "content/urldb.h" diff --git a/utils/file.c b/utils/file.c index 00f8eefec..888811004 100644 --- a/utils/file.c +++ b/utils/file.c @@ -33,6 +33,7 @@ #include "utils/corestrings.h" #include "utils/url.h" #include "utils/nsurl.h" +#include "utils/string.h" #include "utils/file.h" /** diff --git a/utils/messages.c b/utils/messages.c index d652fefae..d343cfcd1 100644 --- a/utils/messages.c +++ b/utils/messages.c @@ -25,6 +25,7 @@ * fast access. */ +#include #include #include #include diff --git a/utils/string.h b/utils/string.h new file mode 100644 index 000000000..03d891700 --- /dev/null +++ b/utils/string.h @@ -0,0 +1,115 @@ +/* + * Copyright 2016 Vincent Sanders + * + * 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 . + */ + +/** + * \file + * \brief Interface to utility string handling. + */ + +#ifndef _NETSURF_UTILS_STRING_H_ +#define _NETSURF_UTILS_STRING_H_ + +#include +#include + +#include "utils/errors.h" + + +/** + * Replace consecutive whitespace with a single space. + * + * @todo determine if squash_whitespace utf-8 safe and that it needs to be + * + * \param s source string + * \return heap allocated result, or NULL on memory exhaustion + */ +char *squash_whitespace(const char * s); + + +/** + * Converts NUL terminated UTF-8 encoded string s containing zero or more + * spaces (char 32) or TABs (char 9) to non-breaking spaces + * (0xC2 + 0xA0 in UTF-8 encoding). + * + * Caller needs to free() result. Returns NULL in case of error. No + * checking is done on validness of the UTF-8 input string. + */ +char *cnv_space2nbsp(const char *s); + + +/** + * Create a human readable representation of a size in bytes. + * + * Does a simple conversion which assumes the user speaks English. + * The buffer returned is one of three static ones so may change each + * time this call is made. Don't store the buffer for later use. + * It's done this way for convenience and to fight possible memory + * leaks, it is not necessarily pretty. + * + * @param bytesize The size in bytes. + * @return A human readable string representing the size. + */ +char *human_friendly_bytesize(unsigned long bytesize); + + +/** + * Generate a string from one or more component elements separated with + * a single value. + * + * This is similar in intent to the perl join function creating a + * single delimited string from an array of several. + * + * @note If a string is allocated it must be freed by the caller. + * + * @param[in,out] str pointer to string pointer if this is NULL enough + * storage will be allocated for the complete path. + * @param[in,out] size The size of the space available if \a str not + * NULL on input and if not NULL set to the total + * output length on output. + * @param[in] sep The character to separate the elements with. + * @param[in] nelm The number of elements up to a maximum of 16. + * @param[in] ap The elements of the path as string pointers. + * @return NSERROR_OK and the complete path is written to str or error + * code on failure. + */ +nserror vsnstrjoin(char **str, size_t *size, char sep, size_t nelm, va_list ap); + + +/** + * Generate a string from one or more component elements separated with + * a single value. + * + * This is similar in intent to the Perl join function creating a + * single delimited string from an array of several. + * + * @note If a string is allocated it must be freed by the caller. + * + * @param[in,out] str pointer to string pointer if this is NULL enough + * storage will be allocated for the complete path. + * @param[in,out] size The size of the space available if \a str not + * NULL on input and if not NULL set to the total + * output length on output. + * @param[in] sep The character to separate the elements with. + * @param[in] nelm The number of elements up to a maximum of 16. + * @param[in] ... The elements of the path as string pointers. + * @return NSERROR_OK and the complete path is written to str or error + * code on failure. + */ +nserror snstrjoin(char **str, size_t *size, char sep, size_t nelm, ...); + +#endif diff --git a/utils/url.c b/utils/url.c index 450d47188..1e3ef423c 100644 --- a/utils/url.c +++ b/utils/url.c @@ -24,11 +24,11 @@ #include #include +#include #include #include "utils/config.h" #include "utils/log.h" -#include "utils/utils.h" #include "utils/url.h" diff --git a/utils/utils.c b/utils/utils.c index 2a41c8a4c..1509a6b09 100644 --- a/utils/utils.c +++ b/utils/utils.c @@ -40,6 +40,7 @@ #include "utils/sys_time.h" #include "utils/inet.h" #include "utils/dirent.h" +#include "utils/string.h" #include "utils/utils.h" /* exported interface documented in utils/utils.h */ diff --git a/utils/utils.h b/utils/utils.h index a4362069f..d4bad9d0c 100644 --- a/utils/utils.h +++ b/utils/utils.h @@ -28,10 +28,6 @@ #include #include -#include -#include - -#include "utils/errors.h" /** Rectangle coordinates */ struct rect { @@ -114,92 +110,11 @@ struct dirent; #define SLEN(x) (sizeof((x)) - 1) -/** - * Replace consecutive whitespace with a single space. - * - * @todo determine if squash_whitespace utf-8 safe and that it needs to be - * - * \param s source string - * \return heap allocated result, or NULL on memory exhaustion - */ -char * squash_whitespace(const char * s); - -/** - * Converts NUL terminated UTF-8 encoded string s containing zero or more - * spaces (char 32) or TABs (char 9) to non-breaking spaces - * (0xC2 + 0xA0 in UTF-8 encoding). - * - * Caller needs to free() result. Returns NULL in case of error. No - * checking is done on validness of the UTF-8 input string. - */ -char *cnv_space2nbsp(const char *s); - /** * Check if a directory exists. */ bool is_dir(const char *path); -/** - * Create a human redable representation of a size in bytes. - * - * Does a simple conversion which assumes the user speaks English. - * The buffer returned is one of three static ones so may change each - * time this call is made. Don't store the buffer for later use. - * It's done this way for convenience and to fight possible memory - * leaks, it is not necessarily pretty. - * - * @todo This implementation is strange doe sit need - * reconsidering? - * - * @param bytesize The size in bytes. - * @return A human readable string representing the size. - */ -char *human_friendly_bytesize(unsigned long bytesize); - - -/** - * Generate a string from one or more component elemnts separated with - * a single value. - * - * This is similar in intent to the perl join function creating a - * single delimited string from an array of several. - * - * @note If a string is allocated it must be freed by the caller. - * - * @param[in,out] str pointer to string pointer if this is NULL enough - * storage will be allocated for the complete path. - * @param[in,out] size The size of the space available if \a str not - * NULL on input and if not NULL set to the total - * output length on output. - * @param[in] sep The character to separete the elemnts with. - * @param[in] nelm The number of elements up to a maximum of 16. - * @param[in] ap The elements of the path as string pointers. - * @return NSERROR_OK and the complete path is written to str or error - * code on faliure. - */ -nserror vsnstrjoin(char **str, size_t *size, char sep, size_t nelm, va_list ap); - -/** - * Generate a string from one or more component elemnts separated with - * a single value. - * - * This is similar in intent to the perl join function creating a - * single delimited string from an array of several. - * - * @note If a string is allocated it must be freed by the caller. - * - * @param[in,out] str pointer to string pointer if this is NULL enough - * storage will be allocated for the complete path. - * @param[in,out] size The size of the space available if \a str not - * NULL on input and if not NULL set to the total - * output length on output. - * @param[in] sep The character to separete the elemnts with. - * @param[in] nelm The number of elements up to a maximum of 16. - * @param[in] ... The elements of the path as string pointers. - * @return NSERROR_OK and the complete path is written to str or error - * code on faliure. - */ -nserror snstrjoin(char **str, size_t *size, char sep, size_t nelm, ...); /* Platform specific functions */ void warn_user(const char *warning, const char *detail); diff --git a/windows/download.c b/windows/download.c index 110c27280..c2cda8fb8 100644 --- a/windows/download.c +++ b/windows/download.c @@ -29,6 +29,7 @@ #include "utils/url.h" #include "utils/nsurl.h" #include "utils/utils.h" +#include "utils/string.h" #include "content/fetch.h" #include "desktop/gui_download.h" #include "desktop/download.h" diff --git a/windows/file.c b/windows/file.c index f8372b453..e9eb9caf9 100644 --- a/windows/file.c +++ b/windows/file.c @@ -34,6 +34,7 @@ #include "utils/corestrings.h" #include "utils/url.h" #include "utils/file.h" +#include "utils/string.h" #include "desktop/browser.h" #include "windows/file.h" diff --git a/windows/schedule.c b/windows/schedule.c index 249e60e27..5366add9c 100644 --- a/windows/schedule.c +++ b/windows/schedule.c @@ -16,6 +16,7 @@ * along with this program. If not, see . */ +#include #include #include "utils/sys_time.h" -- cgit v1.2.3