From 3a683dbb70d74e8f515ab32a2ccc48ea24c0a2b9 Mon Sep 17 00:00:00 2001 From: Jordan Bancino Date: Mon, 30 Oct 2023 12:10:41 -0400 Subject: [PATCH] Fix includes in headers. These are installed to the system and some compilers may not find the headers in the current directory if we don't do this, even though according to the C standard, either should work. --- src/include/Args.h | 2 +- src/include/Cron.h | 2 +- src/include/Db.h | 4 ++-- src/include/HashMap.h | 2 +- src/include/HeaderParser.h | 4 ++-- src/include/Http.h | 4 ++-- src/include/HttpClient.h | 4 ++-- src/include/HttpRouter.h | 2 +- src/include/HttpServer.h | 7 +++---- src/include/Int64.h | 4 ++-- src/include/Json.h | 8 ++++---- src/include/Log.h | 2 +- src/include/Runtime.h | 2 -- src/include/Str.h | 2 +- src/include/Stream.h | 2 +- src/include/Tls.h | 2 +- src/include/UInt64.h | 2 +- src/include/Util.h | 4 ++-- 18 files changed, 28 insertions(+), 31 deletions(-) diff --git a/src/include/Args.h b/src/include/Args.h index 3108de3..2161c1b 100644 --- a/src/include/Args.h +++ b/src/include/Args.h @@ -38,7 +38,7 @@ * provide the standard command line interface. */ -#include +#include "Array.h" /** * All state is stored in this structure, instead of global diff --git a/src/include/Cron.h b/src/include/Cron.h index e78900d..23053c6 100644 --- a/src/include/Cron.h +++ b/src/include/Cron.h @@ -56,7 +56,7 @@ * by any means. */ -#include +#include "Int.h" /** * All functions defined here operate on a structure opaque to the diff --git a/src/include/Db.h b/src/include/Db.h index 618a2e2..da98a39 100644 --- a/src/include/Db.h +++ b/src/include/Db.h @@ -38,8 +38,8 @@ #include -#include -#include +#include "HashMap.h" +#include "Array.h" /** * All functions in this API operate on a database structure that is diff --git a/src/include/HashMap.h b/src/include/HashMap.h index 1359400..f0ee7f3 100644 --- a/src/include/HashMap.h +++ b/src/include/HashMap.h @@ -46,7 +46,7 @@ #include -#include +#include "Array.h" /** * These functions operate on an opaque structure, which the caller diff --git a/src/include/HeaderParser.h b/src/include/HeaderParser.h index ffb3d0b..52d8e33 100644 --- a/src/include/HeaderParser.h +++ b/src/include/HeaderParser.h @@ -41,8 +41,8 @@ * for example usage of this parser. */ -#include -#include +#include "Stream.h" +#include "Array.h" #define HEADER_EXPR_MAX 4096 diff --git a/src/include/Http.h b/src/include/Http.h index d2de020..37875d8 100644 --- a/src/include/Http.h +++ b/src/include/Http.h @@ -42,8 +42,8 @@ #include -#include -#include +#include "HashMap.h" +#include "Stream.h" #define HTTP_FLAG_NONE 0 #define HTTP_FLAG_TLS (1 << 0) diff --git a/src/include/HttpClient.h b/src/include/HttpClient.h index f757041..28fe3c2 100644 --- a/src/include/HttpClient.h +++ b/src/include/HttpClient.h @@ -39,8 +39,8 @@ #include -#include -#include +#include "HashMap.h" +#include "Http.h" /** * A server response is represented by a client context. It is diff --git a/src/include/HttpRouter.h b/src/include/HttpRouter.h index 6816178..a0950b0 100644 --- a/src/include/HttpRouter.h +++ b/src/include/HttpRouter.h @@ -38,7 +38,7 @@ * handler functions. */ -#include +#include "Array.h" /** * The router structure is opaque and thus managed entirely by the diff --git a/src/include/HttpServer.h b/src/include/HttpServer.h index f8e449a..78ef2f8 100644 --- a/src/include/HttpServer.h +++ b/src/include/HttpServer.h @@ -46,12 +46,11 @@ * closely resembles Java. */ -#include - #include -#include -#include +#include "Http.h" +#include "HashMap.h" +#include "Stream.h" /** * The functions on this API operate on an opaque structure. diff --git a/src/include/Int64.h b/src/include/Int64.h index 08083c1..e380ab4 100644 --- a/src/include/Int64.h +++ b/src/include/Int64.h @@ -64,8 +64,8 @@ * @ignore-typedefs */ -#include -#include +#include "Int.h" +#include "UInt64.h" #include diff --git a/src/include/Json.h b/src/include/Json.h index 4185260..cc4a63d 100644 --- a/src/include/Json.h +++ b/src/include/Json.h @@ -68,10 +68,10 @@ * behavior. */ -#include -#include -#include -#include +#include "HashMap.h" +#include "Array.h" +#include "Stream.h" +#include "Int64.h" #include #include diff --git a/src/include/Log.h b/src/include/Log.h index d0300ca..1567b6e 100644 --- a/src/include/Log.h +++ b/src/include/Log.h @@ -42,7 +42,7 @@ #include #include -#include +#include "Stream.h" #define LOG_FLAG_COLOR (1 << 0) #define LOG_FLAG_SYSLOG (1 << 1) diff --git a/src/include/Runtime.h b/src/include/Runtime.h index 6e13b6a..f23a1ba 100644 --- a/src/include/Runtime.h +++ b/src/include/Runtime.h @@ -37,8 +37,6 @@ * the runtime stub needs to know their definitions. */ -#include - /** * Write a memory report to a file in the current directory, using * the provided program arguments, including the program name that diff --git a/src/include/Str.h b/src/include/Str.h index 714b8d8..cae9062 100644 --- a/src/include/Str.h +++ b/src/include/Str.h @@ -39,7 +39,7 @@ * is a standard library header. */ -#include +#include "Int.h" #include diff --git a/src/include/Stream.h b/src/include/Stream.h index 3ddacc6..7c6a1a5 100644 --- a/src/include/Stream.h +++ b/src/include/Stream.h @@ -36,7 +36,7 @@ * C library and offering some more convenience features. */ -#include +#include "Io.h" #include diff --git a/src/include/Tls.h b/src/include/Tls.h index 4407ed0..8314f7d 100644 --- a/src/include/Tls.h +++ b/src/include/Tls.h @@ -46,7 +46,7 @@ * .El */ -#include +#include "Stream.h" #define TLS_LIBRESSL 2 #define TLS_OPENSSL 3 diff --git a/src/include/UInt64.h b/src/include/UInt64.h index 51cc30c..c16fc22 100644 --- a/src/include/UInt64.h +++ b/src/include/UInt64.h @@ -64,7 +64,7 @@ * @ignore-typedefs */ -#include +#include "Int.h" #include diff --git a/src/include/Util.h b/src/include/Util.h index d6c3830..e7bef57 100644 --- a/src/include/Util.h +++ b/src/include/Util.h @@ -42,8 +42,8 @@ #include #include -#include -#include +#include "Stream.h" +#include "UInt64.h" /** * Get the current timestamp in milliseconds since the Unix epoch. This