diff options
| -rw-r--r-- | src/base64.c | 2 | ||||
| -rw-r--r-- | src/byte_sink.c | 2 | ||||
| -rw-r--r-- | src/int_math.h | 2 | ||||
| -rw-r--r-- | src/n3.c | 2 | ||||
| -rw-r--r-- | src/namespaces.h (renamed from src/serd_internal.h) | 12 | ||||
| -rw-r--r-- | src/node.c | 2 | ||||
| -rw-r--r-- | src/reader.c | 2 | ||||
| -rw-r--r-- | src/static_nodes.h | 2 | ||||
| -rw-r--r-- | src/system.c | 1 | ||||
| -rw-r--r-- | src/system.h | 2 | ||||
| -rw-r--r-- | src/world.c | 2 | ||||
| -rw-r--r-- | src/writer.c | 2 | ||||
| -rw-r--r-- | wscript | 3 |
13 files changed, 17 insertions, 19 deletions
diff --git a/src/base64.c b/src/base64.c index bcf6b361..56c3c0a1 100644 --- a/src/base64.c +++ b/src/base64.c @@ -14,7 +14,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "serd_internal.h" +#include "int_math.h" #include "string_utils.h" #include "serd/serd.h" diff --git a/src/byte_sink.c b/src/byte_sink.c index 965d9666..a4eb8098 100644 --- a/src/byte_sink.c +++ b/src/byte_sink.c @@ -14,7 +14,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include "serd_internal.h" +#include "int_math.h" #include "system.h" #include "serd/serd.h" diff --git a/src/int_math.h b/src/int_math.h index 34ceba64..b2e66856 100644 --- a/src/int_math.h +++ b/src/int_math.h @@ -19,6 +19,8 @@ #include <stdint.h> +#define MIN(x, y) ((x) < (y) ? (x) : (y)) + static const uint64_t POW10[] = {1ull, 10ull, 100ull, @@ -15,9 +15,9 @@ */ #include "byte_source.h" +#include "namespaces.h" #include "node.h" #include "reader.h" -#include "serd_internal.h" #include "stack.h" #include "string_utils.h" #include "uri_utils.h" diff --git a/src/serd_internal.h b/src/namespaces.h index 94e780bb..b5228a4d 100644 --- a/src/serd_internal.h +++ b/src/namespaces.h @@ -14,8 +14,8 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#ifndef SERD_INTERNAL_H -#define SERD_INTERNAL_H +#ifndef SERD_NAMESPACES_H +#define SERD_NAMESPACES_H #include "world.h" @@ -33,10 +33,4 @@ #define NS_XSD "http://www.w3.org/2001/XMLSchema#" #define NS_RDF "http://www.w3.org/1999/02/22-rdf-syntax-ns#" -#define SERD_PAGE_SIZE 4096 - -#ifndef MIN -# define MIN(a, b) (((a) < (b)) ? (a) : (b)) -#endif - -#endif // SERD_INTERNAL_H +#endif // SERD_NAMESPACES_H @@ -16,7 +16,7 @@ #include "node.h" -#include "serd_internal.h" +#include "namespaces.h" #include "static_nodes.h" #include "string_utils.h" #include "system.h" diff --git a/src/reader.c b/src/reader.c index 86960857..668cd38d 100644 --- a/src/reader.c +++ b/src/reader.c @@ -17,7 +17,7 @@ #include "reader.h" #include "system.h" -#include "serd_internal.h" +#include "namespaces.h" #include "stack.h" #include "statement.h" #include "world.h" diff --git a/src/static_nodes.h b/src/static_nodes.h index 1399f580..f4794d72 100644 --- a/src/static_nodes.h +++ b/src/static_nodes.h @@ -17,8 +17,8 @@ #ifndef SERD_STATIC_NODES_H #define SERD_STATIC_NODES_H +#include "namespaces.h" #include "node.h" -#include "serd_internal.h" typedef struct StaticNode { SerdNode node; diff --git a/src/system.c b/src/system.c index 5141bf40..acc593ed 100644 --- a/src/system.c +++ b/src/system.c @@ -19,7 +19,6 @@ #include "system.h" #include "serd_config.h" -#include "serd_internal.h" #include <stdio.h> #include <stdlib.h> diff --git a/src/system.h b/src/system.h index 903fdb3d..1d791bc7 100644 --- a/src/system.h +++ b/src/system.h @@ -20,6 +20,8 @@ #include <stdint.h> #include <stdio.h> +#define SERD_PAGE_SIZE 4096 + /** fread-like wrapper for getc (which is faster). */ static inline size_t serd_file_read_byte(void* buf, size_t size, size_t nmemb, void* stream) diff --git a/src/world.c b/src/world.c index 45f31ea6..5375e8b5 100644 --- a/src/world.c +++ b/src/world.c @@ -18,9 +18,9 @@ #include "world.h" +#include "namespaces.h" #include "node.h" #include "serd_config.h" -#include "serd_internal.h" #if defined(HAVE_POSIX_FADVISE) # include <fcntl.h> diff --git a/src/writer.c b/src/writer.c index 4f41b303..2686cc8a 100644 --- a/src/writer.c +++ b/src/writer.c @@ -16,10 +16,10 @@ #include "env.h" #include "node.h" -#include "serd_internal.h" #include "sink.h" #include "stack.h" #include "string_utils.h" +#include "system.h" #include "uri_utils.h" #include "world.h" @@ -370,7 +370,8 @@ def amalgamate(ctx): amalgamation.write('/* This is amalgamated code, do not edit! */\n') amalgamation.write('#include "serd.h"\n\n') - for header_path in ['src/serd_internal.h', + for header_path in ['src/namespaces.h', + 'src/serd_internal.h', 'src/system.h', 'src/byte_sink.h', 'src/byte_source.h', |