Revise export header includes

Signed-off-by: Juan Cruz Viotti <[email protected]>
sourcemeta · Oct 18, 2024 · 6e5f806 · 6e5f806
1 parent c0d2f53
commit 6e5f806
Show file tree

Hide file tree

Showing 36 changed files with 60 additions and 92 deletions.
diff --git a/DEPENDENCIES b/DEPENDENCIES
@@ -1,6 +1,6 @@
 vendorpull https://github.com/sourcemeta/vendorpull 70342aaf458e6cb80baeb5b718901075fc42ede6
-noa https://github.com/sourcemeta/noa 837e1ff981f8df45d9e2977a50f5da61d8affed4
-jsontoolkit https://github.com/sourcemeta/jsontoolkit 9685d29e2e633d71319c64b1ab2fbceab865dbf3
+noa https://github.com/sourcemeta/noa caad2e1ceedf9fd1a18686a6a6d1e2b9757ead75
+jsontoolkit https://github.com/sourcemeta/jsontoolkit 2d78929faf0f96110edfb67fa3ddf6916cf35ef7
 bearssl https://www.bearssl.org/git/BearSSL 8ef7680081c61b486622f2d983c0d3d21e83caad
 zlib https://github.com/madler/zlib 51b7f2abdade71cd9bb0e7a373ef2610ec6f9daf
 uwebsockets https://github.com/uNetworking/uWebSockets v20.67.0

diff --git a/src/bucket/include/sourcemeta/hydra/bucket.h b/src/bucket/include/sourcemeta/hydra/bucket.h
@@ -1,10 +1,8 @@
 #ifndef SOURCEMETA_HYDRA_BUCKET_H
 #define SOURCEMETA_HYDRA_BUCKET_H
 
-#if defined(__Unikraft__)
-#define SOURCEMETA_HYDRA_BUCKET_EXPORT
-#else
-#include "bucket_export.h"
+#ifndef SOURCEMETA_HYDRA_BUCKET_EXPORT
+#include <sourcemeta/hydra/bucket_export.h>
 #endif
 
 /// @defgroup bucket Bucket

diff --git a/src/bucket/include/sourcemeta/hydra/bucket_aws_sigv4.h b/src/bucket/include/sourcemeta/hydra/bucket_aws_sigv4.h
@@ -1,10 +1,8 @@
 #ifndef SOURCEMETA_HYDRA_BUCKET_AWS_SIGV4_H
 #define SOURCEMETA_HYDRA_BUCKET_AWS_SIGV4_H
 
-#if defined(__Unikraft__)
-#define SOURCEMETA_HYDRA_BUCKET_EXPORT
-#else
-#include "bucket_export.h"
+#ifndef SOURCEMETA_HYDRA_BUCKET_EXPORT
+#include <sourcemeta/hydra/bucket_export.h>
 #endif
 
 #include <sourcemeta/hydra/http.h>

diff --git a/src/bucket/include/sourcemeta/hydra/bucket_error.h b/src/bucket/include/sourcemeta/hydra/bucket_error.h
@@ -1,10 +1,8 @@
 #ifndef SOURCEMETA_HYDRA_BUCKET_ERROR_H
 #define SOURCEMETA_HYDRA_BUCKET_ERROR_H
 
-#if defined(__Unikraft__)
-#define SOURCEMETA_HYDRA_BUCKET_EXPORT
-#else
-#include "bucket_export.h"
+#ifndef SOURCEMETA_HYDRA_BUCKET_EXPORT
+#include <sourcemeta/hydra/bucket_export.h>
 #endif
 
 #include <exception> // std::exception

diff --git a/src/crypto/include/sourcemeta/hydra/crypto.h b/src/crypto/include/sourcemeta/hydra/crypto.h
@@ -1,10 +1,8 @@
 #ifndef SOURCEMETA_HYDRA_CRYPTO_H
 #define SOURCEMETA_HYDRA_CRYPTO_H
 
-#if defined(__Unikraft__)
-#define SOURCEMETA_HYDRA_CRYPTO_EXPORT
-#else
-#include "crypto_export.h"
+#ifndef SOURCEMETA_HYDRA_CRYPTO_EXPORT
+#include <sourcemeta/hydra/crypto_export.h>
 #endif
 
 #include <ostream>     // std::ostream

diff --git a/src/http/include/sourcemeta/hydra/http_error.h b/src/http/include/sourcemeta/hydra/http_error.h
@@ -1,10 +1,8 @@
 #ifndef SOURCEMETA_HYDRA_HTTP_ERROR_H
 #define SOURCEMETA_HYDRA_HTTP_ERROR_H
 
-#if defined(__Unikraft__)
-#define SOURCEMETA_HYDRA_HTTP_EXPORT
-#else
-#include "http_export.h"
+#ifndef SOURCEMETA_HYDRA_HTTP_EXPORT
+#include <sourcemeta/hydra/http_export.h>
 #endif
 
 #include <exception> // std::exception

diff --git a/src/http/include/sourcemeta/hydra/http_header.h b/src/http/include/sourcemeta/hydra/http_header.h
@@ -1,10 +1,8 @@
 #ifndef SOURCEMETA_HYDRA_HTTP_HEADER_H
 #define SOURCEMETA_HYDRA_HTTP_HEADER_H
 
-#if defined(__Unikraft__)
-#define SOURCEMETA_HYDRA_HTTP_EXPORT
-#else
-#include "http_export.h"
+#ifndef SOURCEMETA_HYDRA_HTTP_EXPORT
+#include <sourcemeta/hydra/http_export.h>
 #endif
 
 #include <chrono>  // std::chrono::system_clock::time_point

diff --git a/src/http/include/sourcemeta/hydra/http_method.h b/src/http/include/sourcemeta/hydra/http_method.h
@@ -1,10 +1,8 @@
 #ifndef SOURCEMETA_HYDRA_HTTP_METHOD_H
 #define SOURCEMETA_HYDRA_HTTP_METHOD_H
 
-#if defined(__Unikraft__)
-#define SOURCEMETA_HYDRA_HTTP_EXPORT
-#else
-#include "http_export.h"
+#ifndef SOURCEMETA_HYDRA_HTTP_EXPORT
+#include <sourcemeta/hydra/http_export.h>
 #endif
 
 #include <ostream>     // std::ostream

diff --git a/src/http/include/sourcemeta/hydra/http_mime.h b/src/http/include/sourcemeta/hydra/http_mime.h
@@ -1,10 +1,8 @@
 #ifndef SOURCEMETA_HYDRA_HTTP_MIME_H
 #define SOURCEMETA_HYDRA_HTTP_MIME_H
 
-#if defined(__Unikraft__)
-#define SOURCEMETA_HYDRA_HTTP_EXPORT
-#else
-#include "http_export.h"
+#ifndef SOURCEMETA_HYDRA_HTTP_EXPORT
+#include <sourcemeta/hydra/http_export.h>
 #endif
 
 #include <filesystem> // std::filesystem

diff --git a/src/http/include/sourcemeta/hydra/http_status.h b/src/http/include/sourcemeta/hydra/http_status.h
@@ -1,10 +1,8 @@
 #ifndef SOURCEMETA_HYDRA_HTTP_STATUS_H
 #define SOURCEMETA_HYDRA_HTTP_STATUS_H
 
-#if defined(__Unikraft__)
-#define SOURCEMETA_HYDRA_HTTP_EXPORT
-#else
-#include "http_export.h"
+#ifndef SOURCEMETA_HYDRA_HTTP_EXPORT
+#include <sourcemeta/hydra/http_export.h>
 #endif
 
 #include <cstdint> // std::uint16_t

diff --git a/src/http/include/sourcemeta/hydra/http_time.h b/src/http/include/sourcemeta/hydra/http_time.h
@@ -1,10 +1,8 @@
 #ifndef SOURCEMETA_HYDRA_HTTP_TIME_H
 #define SOURCEMETA_HYDRA_HTTP_TIME_H
 
-#if defined(__Unikraft__)
-#define SOURCEMETA_HYDRA_HTTP_EXPORT
-#else
-#include "http_export.h"
+#ifndef SOURCEMETA_HYDRA_HTTP_EXPORT
+#include <sourcemeta/hydra/http_export.h>
 #endif
 
 #include <chrono> // std::chrono::system_clock::time_point

diff --git a/src/httpclient/include/sourcemeta/hydra/httpclient_request.h b/src/httpclient/include/sourcemeta/hydra/httpclient_request.h
@@ -1,10 +1,8 @@
 #ifndef SOURCEMETA_HYDRA_HTTPCLIENT_REQUEST_H
 #define SOURCEMETA_HYDRA_HTTPCLIENT_REQUEST_H
 
-#if defined(__Unikraft__)
-#define SOURCEMETA_HYDRA_HTTPCLIENT_EXPORT
-#else
-#include "httpclient_export.h"
+#ifndef SOURCEMETA_HYDRA_HTTPCLIENT_EXPORT
+#include <sourcemeta/hydra/httpclient_export.h>
 #endif
 
 #include <sourcemeta/hydra/http.h>

diff --git a/src/httpclient/include/sourcemeta/hydra/httpclient_response.h b/src/httpclient/include/sourcemeta/hydra/httpclient_response.h
@@ -1,10 +1,8 @@
 #ifndef SOURCEMETA_HYDRA_HTTPCLIENT_RESPONSE_H
 #define SOURCEMETA_HYDRA_HTTPCLIENT_RESPONSE_H
 
-#if defined(__Unikraft__)
-#define SOURCEMETA_HYDRA_HTTPCLIENT_EXPORT
-#else
-#include "httpclient_export.h"
+#ifndef SOURCEMETA_HYDRA_HTTPCLIENT_EXPORT
+#include <sourcemeta/hydra/httpclient_export.h>
 #endif
 
 #include <sourcemeta/hydra/http.h>

diff --git a/src/httpclient/include/sourcemeta/hydra/httpclient_stream.h b/src/httpclient/include/sourcemeta/hydra/httpclient_stream.h
@@ -1,10 +1,8 @@
 #ifndef SOURCEMETA_HYDRA_HTTPCLIENT_STREAM_H
 #define SOURCEMETA_HYDRA_HTTPCLIENT_STREAM_H
 
-#if defined(__Unikraft__)
-#define SOURCEMETA_HYDRA_HTTPCLIENT_EXPORT
-#else
-#include "httpclient_export.h"
+#ifndef SOURCEMETA_HYDRA_HTTPCLIENT_EXPORT
+#include <sourcemeta/hydra/httpclient_export.h>
 #endif
 
 #include <sourcemeta/hydra/http.h>

diff --git a/src/httpserver/include/sourcemeta/hydra/httpserver.h b/src/httpserver/include/sourcemeta/hydra/httpserver.h
@@ -1,10 +1,8 @@
 #ifndef SOURCEMETA_HYDRA_HTTPSERVER_H
 #define SOURCEMETA_HYDRA_HTTPSERVER_H
 
-#if defined(__Unikraft__)
-#define SOURCEMETA_HYDRA_HTTPSERVER_EXPORT
-#else
-#include "httpserver_export.h"
+#ifndef SOURCEMETA_HYDRA_HTTPSERVER_EXPORT
+#include <sourcemeta/hydra/httpserver_export.h>
 #endif
 
 /// @defgroup httpserver HTTP Server

diff --git a/src/httpserver/include/sourcemeta/hydra/httpserver_logger.h b/src/httpserver/include/sourcemeta/hydra/httpserver_logger.h
@@ -1,10 +1,8 @@
 #ifndef SOURCEMETA_HYDRA_HTTPSERVER_LOGGER_H
 #define SOURCEMETA_HYDRA_HTTPSERVER_LOGGER_H
 
-#if defined(__Unikraft__)
-#define SOURCEMETA_HYDRA_HTTPSERVER_EXPORT
-#else
-#include "httpserver_export.h"
+#ifndef SOURCEMETA_HYDRA_HTTPSERVER_EXPORT
+#include <sourcemeta/hydra/httpserver_export.h>
 #endif
 
 #include <string>      // std::string

diff --git a/src/httpserver/include/sourcemeta/hydra/httpserver_request.h b/src/httpserver/include/sourcemeta/hydra/httpserver_request.h
@@ -1,10 +1,8 @@
 #ifndef SOURCEMETA_HYDRA_HTTPSERVER_REQUEST_H
 #define SOURCEMETA_HYDRA_HTTPSERVER_REQUEST_H
 
-#if defined(__Unikraft__)
-#define SOURCEMETA_HYDRA_HTTPSERVER_EXPORT
-#else
-#include "httpserver_export.h"
+#ifndef SOURCEMETA_HYDRA_HTTPSERVER_EXPORT
+#include <sourcemeta/hydra/httpserver_export.h>
 #endif
 
 #include <sourcemeta/hydra/http.h>

diff --git a/src/httpserver/include/sourcemeta/hydra/httpserver_response.h b/src/httpserver/include/sourcemeta/hydra/httpserver_response.h
@@ -1,10 +1,8 @@
 #ifndef SOURCEMETA_HYDRA_HTTPSERVER_RESPONSE_H
 #define SOURCEMETA_HYDRA_HTTPSERVER_RESPONSE_H
 
-#if defined(__Unikraft__)
-#define SOURCEMETA_HYDRA_HTTPSERVER_EXPORT
-#else
-#include "httpserver_export.h"
+#ifndef SOURCEMETA_HYDRA_HTTPSERVER_EXPORT
+#include <sourcemeta/hydra/httpserver_export.h>
 #endif
 
 #include <sourcemeta/hydra/http.h>

diff --git a/vendor/jsontoolkit/src/json/include/sourcemeta/jsontoolkit/json.h b/vendor/jsontoolkit/src/json/include/sourcemeta/jsontoolkit/json.h
diff --git a/vendor/jsontoolkit/src/json/include/sourcemeta/jsontoolkit/json_error.h b/vendor/jsontoolkit/src/json/include/sourcemeta/jsontoolkit/json_error.h
diff --git a/vendor/jsontoolkit/src/json/include/sourcemeta/jsontoolkit/json_value.h b/vendor/jsontoolkit/src/json/include/sourcemeta/jsontoolkit/json_value.h
diff --git a/vendor/jsontoolkit/src/jsonl/include/sourcemeta/jsontoolkit/jsonl.h b/vendor/jsontoolkit/src/jsonl/include/sourcemeta/jsontoolkit/jsonl.h
diff --git a/vendor/jsontoolkit/src/jsonl/include/sourcemeta/jsontoolkit/jsonl_iterator.h b/vendor/jsontoolkit/src/jsonl/include/sourcemeta/jsontoolkit/jsonl_iterator.h
diff --git a/vendor/jsontoolkit/src/jsonpointer/include/sourcemeta/jsontoolkit/jsonpointer.h b/vendor/jsontoolkit/src/jsonpointer/include/sourcemeta/jsontoolkit/jsonpointer.h
diff --git a/vendor/jsontoolkit/src/jsonpointer/include/sourcemeta/jsontoolkit/jsonpointer_error.h b/vendor/jsontoolkit/src/jsonpointer/include/sourcemeta/jsontoolkit/jsonpointer_error.h
diff --git a/vendor/jsontoolkit/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema.h b/vendor/jsontoolkit/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema.h
diff --git a/vendor/jsontoolkit/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema_anchor.h b/vendor/jsontoolkit/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema_anchor.h
diff --git a/vendor/jsontoolkit/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema_bundle.h b/vendor/jsontoolkit/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema_bundle.h
diff --git a/vendor/jsontoolkit/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema_error.h b/vendor/jsontoolkit/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema_error.h
diff --git a/vendor/jsontoolkit/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema_reference.h b/vendor/jsontoolkit/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema_reference.h
diff --git a/vendor/jsontoolkit/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema_resolver.h b/vendor/jsontoolkit/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema_resolver.h
diff --git a/vendor/jsontoolkit/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema_walker.h b/vendor/jsontoolkit/src/jsonschema/include/sourcemeta/jsontoolkit/jsonschema_walker.h
diff --git a/vendor/jsontoolkit/src/uri/include/sourcemeta/jsontoolkit/uri.h b/vendor/jsontoolkit/src/uri/include/sourcemeta/jsontoolkit/uri.h
diff --git a/vendor/jsontoolkit/src/uri/include/sourcemeta/jsontoolkit/uri_error.h b/vendor/jsontoolkit/src/uri/include/sourcemeta/jsontoolkit/uri_error.h