Use Zix attributes directly

1 files changed, 13 insertions, 12 deletions

diff --git a/include/serd/event.h b/include/serd/event.h
index 0c6437f6..f5399366 100644
--- a/include/serd/event.h
+++ b/include/serd/event.h
@@ -8,6 +8,7 @@
 #include "serd/node.h"
 #include "serd/statement.h"
 #include "serd/status.h"
+#include "zix/attributes.h"
 
 SERD_BEGIN_DECLS
 
@@ -31,8 +32,8 @@ typedef enum {
    Emitted whenever the base URI changes.
 */
 typedef struct {
-  SerdEventType                type; ///< #SERD_BASE
-  const SerdNode* SERD_NONNULL uri;  ///< Base URI
+  SerdEventType               type; ///< #SERD_BASE
+  const SerdNode* ZIX_NONNULL uri;  ///< Base URI
 } SerdBaseEvent;
 
 /**
@@ -41,9 +42,9 @@ typedef struct {
    Emitted whenever a prefix is defined.
 */
 typedef struct {
-  SerdEventType                type; ///< #SERD_PREFIX
-  const SerdNode* SERD_NONNULL name; ///< Prefix name
-  const SerdNode* SERD_NONNULL uri;  ///< Namespace URI
+  SerdEventType               type; ///< #SERD_PREFIX
+  const SerdNode* ZIX_NONNULL name; ///< Prefix name
+  const SerdNode* ZIX_NONNULL uri;  ///< Namespace URI
 } SerdPrefixEvent;
 
 /**
@@ -52,9 +53,9 @@ typedef struct {
    Emitted for every statement.
 */
 typedef struct {
-  SerdEventType                     type;      ///< #SERD_STATEMENT
-  SerdStatementFlags                flags;     ///< Flags for pretty-printing
-  const SerdStatement* SERD_NONNULL statement; ///< Statement
+  SerdEventType                    type;      ///< #SERD_STATEMENT
+  SerdStatementFlags               flags;     ///< Flags for pretty-printing
+  const SerdStatement* ZIX_NONNULL statement; ///< Statement
 } SerdStatementEvent;
 
 /**
@@ -65,8 +66,8 @@ typedef struct {
    write a delimiter.
 */
 typedef struct {
-  SerdEventType                type; ///< #SERD_END
-  const SerdNode* SERD_NONNULL node; ///< Anonymous node that is finished
+  SerdEventType               type; ///< #SERD_END
+  const SerdNode* ZIX_NONNULL node; ///< Anonymous node that is finished
 } SerdEndEvent;
 
 /**
@@ -87,8 +88,8 @@ typedef union {
 } SerdEvent;
 
 /// Function for handling events
-typedef SerdStatus (*SerdEventFunc)(void* SERD_NULLABLE           handle,
-                                    const SerdEvent* SERD_NONNULL event);
+typedef SerdStatus (*SerdEventFunc)(void* ZIX_NULLABLE           handle,
+                                    const SerdEvent* ZIX_NONNULL event);
 
 /**
    @}