Merge pull request #232 from tlsa/tlsa/revert-static-assert

Revert "Data: Switch to using C11 style static assert."

src/data.h

@@ -58,9 +58,8 @@ static inline void cyaml_data_write_pointer(
 {
 	/* Refuse to build on platforms where sizeof pointer would
 	 * lead to \ref CYAML_ERR_INVALID_DATA_SIZE. */
-	static_assert(sizeof(char *) >  0, "Incompatible pointer size.");
-	static_assert(sizeof(char *) <= sizeof(uint64_t),
-			"Incompatible pointer size.");
+	cyaml_static_assert(sizeof(char *) >  0);
+	cyaml_static_assert(sizeof(char *) <= sizeof(uint64_t));
 
 	CYAML_UNUSED(cyaml_data_write((uint64_t)ptr, sizeof(ptr), data_target));
 
@@ -116,9 +115,8 @@ static inline uint8_t * cyaml_data_read_pointer(
 
 	/* Refuse to build on platforms where sizeof pointer would
 	 * lead to \ref CYAML_ERR_INVALID_DATA_SIZE. */
-	static_assert(sizeof(char *) >  0, "Incompatible pointer size.");
-	static_assert(sizeof(char *) <= sizeof(uint64_t),
-			"Incompatible pointer size.");
+	cyaml_static_assert(sizeof(char *) >  0);
+	cyaml_static_assert(sizeof(char *) <= sizeof(uint64_t));
 
 	return (void *)cyaml_data_read(sizeof(char *), data, &err);
 }

src/util.h

@@ -15,6 +15,14 @@
 #include "cyaml/cyaml.h"
 #include "utf8.h"
 
+/** Compile time assertion macro. */
+#define cyaml_static_assert(e) \
+{ \
+	enum { \
+		cyaml_static_assert_check = 1 / (!!(e)) \
+	}; \
+}
+
 /** Macro to squash unused variable compiler warnings. */
 #define CYAML_UNUSED(_x) ((void)(_x))