diff options
Diffstat (limited to 'macro.h')
-rw-r--r-- | macro.h | 13 |
1 files changed, 11 insertions, 2 deletions
@@ -13,7 +13,7 @@ #define sa_return_if_fail(expr) \ do { \ if (!(expr)) { \ - fprintf(stderr, PRETTY_FUNCTION ": Assertion <" #expr "> failed.\n"); \ + fprintf(stderr, "%s: Assertion <%s> failed.\n", PRETTY_FUNCTION, #expr ); \ return; \ } \ } while(0) @@ -21,7 +21,7 @@ #define sa_return_val_if_fail(expr, val) \ do { \ if (!(expr)) { \ - fprintf(stderr, "%s: Assertion <" #expr "> failed.\n", PRETTY_FUNCTION ); \ + fprintf(stderr, "%s: Assertion <%s> failed.\n", PRETTY_FUNCTION, #expr ); \ return (val); \ } \ } while(0) @@ -30,4 +30,13 @@ #define sa_assert_not_reached() sa_assert(!"Should not be reached.") +#define elementsof(x) (sizeof(x)/sizeof((x)[0])) + +#ifndef MAX +#define MAX(a, b) ((a) > (b) ? (a) : (b)) +#endif +#ifndef MIN +#define MIN(a, b) ((a) < (b) ? (a) : (b)) +#endif + #endif |