From cb78e5adfafb0dcf8ffe03875d26a7e463b3b1c8 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Fri, 4 Dec 2015 01:50:21 +0100 Subject: [PATCH] workaround for macro collision caused by libwebsockets (already fixed in next las upstream) --- include/utils.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/utils.h b/include/utils.h index a35195066..82eeb9e97 100644 --- a/include/utils.h +++ b/include/utils.h @@ -127,11 +127,13 @@ int version_compare(struct version *a, struct version *b); int version_parse(const char *s, struct version *v); /** Check assertion and exit if failed. */ -#define assert(exp) do { \ +#ifndef assert + #define assert(exp) do { \ if (!EXPECT(exp, 0)) \ error("Assertion failed: '%s' in %s(), %s:%d", \ XSTR(exp), __FUNCTION__, __BASE_FILE__, __LINE__); \ } while (0) +#endif #endif /* _UTILS_H_ */