diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/byte_sink.c | 2 | ||||
| -rw-r--r-- | src/macros.h | 22 | ||||
| -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 | 1 | ||||
| -rw-r--r-- | src/reader.c | 3 | ||||
| -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 |
11 files changed, 34 insertions, 17 deletions
diff --git a/src/byte_sink.c b/src/byte_sink.c index 993fb624..a90f503d 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 "macros.h" #include "system.h" #include "serd/serd.h" diff --git a/src/macros.h b/src/macros.h new file mode 100644 index 00000000..ac5af149 --- /dev/null +++ b/src/macros.h @@ -0,0 +1,22 @@ +/* + Copyright 2019-2020 David Robillard <d@drobilla.net> + + Permission to use, copy, modify, and/or distribute this software for any + purpose with or without fee is hereby granted, provided that the above + copyright notice and this permission notice appear in all copies. + + THIS SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +*/ + +#ifndef SERD_MACROS_H +#define SERD_MACROS_H + +#define MIN(x, y) ((x) < (y) ? (x) : (y)) + +#endif // SERD_MACROS_H @@ -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 "statement.h" #include "string_utils.h" diff --git a/src/serd_internal.h b/src/namespaces.h index 91ba509c..e98eb5e1 100644 --- a/src/serd_internal.h +++ b/src/namespaces.h @@ -14,16 +14,10 @@ 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 #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,6 +16,7 @@ #include "node.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 8a0b1a1f..b0b35387 100644 --- a/src/reader.c +++ b/src/reader.c @@ -16,8 +16,7 @@ #include "reader.h" -#include "byte_source.h" -#include "serd_internal.h" +#include "namespaces.h" #include "stack.h" #include "statement.h" #include "system.h" diff --git a/src/static_nodes.h b/src/static_nodes.h index adbb5849..467d846f 100644 --- a/src/static_nodes.h +++ b/src/static_nodes.h @@ -19,8 +19,8 @@ #include "serd/serd.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 323ed62e..caf211f4 100644 --- a/src/system.c +++ b/src/system.c @@ -19,7 +19,6 @@ #include "system.h" #include "serd_config.h" -#include "serd_internal.h" #ifdef _WIN32 # include <malloc.h> diff --git a/src/system.h b/src/system.h index f0e6e267..c0e970e0 100644 --- a/src/system.h +++ b/src/system.h @@ -22,6 +22,8 @@ #include <stdint.h> #include <stdio.h> +#define SERD_PAGE_SIZE 4096 + /// Allocate a buffer aligned to `alignment` bytes SERD_I_MALLOC_FUNC void* diff --git a/src/world.c b/src/world.c index 354331f6..2cbee1a6 100644 --- a/src/world.c +++ b/src/world.c @@ -19,9 +19,9 @@ #include "world.h" #include "cursor.h" +#include "namespaces.h" #include "node.h" #include "serd_config.h" -#include "serd_internal.h" #if defined(USE_POSIX_FADVISE) # include <fcntl.h> diff --git a/src/writer.c b/src/writer.c index afeee33d..17291c56 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" |