diff options
author | Lennart Poettering <lennart@poettering.net> | 2007-05-22 22:53:09 +0000 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2007-05-22 22:53:09 +0000 |
commit | c1b4872b0910c9aa784d878dca771b21c4690048 (patch) | |
tree | 2ca5aea3f57c1336ab3165b94a385da9db72c00f /macro.h | |
parent | b60e60dbaeff9311b3e74a6d54bb3bbb2c1f61e3 (diff) |
lots of work
git-svn-id: file:///home/lennart/svn/public/libsydney/trunk@30 9ba3c220-e4d3-45a2-8aa3-73fcc9aff6ce
Diffstat (limited to 'macro.h')
-rw-r--r-- | macro.h | 26 |
1 files changed, 13 insertions, 13 deletions
@@ -5,15 +5,15 @@ #include <assert.h> #ifdef __GNUC__ -#define PRETTY_FUNCTION __PRETTY_FUNCTION__ +#define SA_PRETTY_FUNCTION __PRETTY_FUNCTION__ #else -#define PRETTY_FUNCTION "" +#define SA_PRETTY_FUNCTION "" #endif #define sa_return_if_fail(expr) \ do { \ if (!(expr)) { \ - fprintf(stderr, "%s: Assertion <%s> failed.\n", PRETTY_FUNCTION, #expr ); \ + fprintf(stderr, "%s: Assertion <%s> failed.\n", SA_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 <%s> failed.\n", PRETTY_FUNCTION, #expr ); \ + fprintf(stderr, "%s: Assertion <%s> failed.\n", SA_PRETTY_FUNCTION, #expr ); \ return (val); \ } \ } while(0) @@ -29,7 +29,7 @@ #define sa_return_if_fail_mutex(m, expr) \ do { \ if (!(expr)) { \ - fprintf(stderr, "%s: Assertion <%s> failed.\n", PRETTY_FUNCTION, #expr ); \ + fprintf(stderr, "%s: Assertion <%s> failed.\n", SA_PRETTY_FUNCTION, #expr ); \ sa_mutex_unlock(m); \ return; \ } \ @@ -39,7 +39,7 @@ do { \ if (!(expr)) { \ \ - fprintf(stderr, "%s: Assertion <%s> failed.\n", PRETTY_FUNCTION, #expr ); \ + fprintf(stderr, "%s: Assertion <%s> failed.\n", SA_PRETTY_FUNCTION, #expr ); \ sa_mutex_unlock(m); \ return (val); \ } \ @@ -54,19 +54,19 @@ sa_assert(_r == 0); \ } while(0) -#define elementsof(x) (sizeof(x)/sizeof((x)[0])) +#define SA_ELEMENTSOF(x) (sizeof(x)/sizeof((x)[0])) -#ifndef MAX -#define MAX(a, b) ((a) > (b) ? (a) : (b)) +#ifndef SA_MAX +#define SA_MAX(a, b) ((a) > (b) ? (a) : (b)) #endif -#ifndef MIN -#define MIN(a, b) ((a) < (b) ? (a) : (b)) +#ifndef SA_MIN +#define SA_MIN(a, b) ((a) < (b) ? (a) : (b)) #endif -static inline size_t align(size_t l) { +static inline size_t sa_align(size_t l) { return (((l + sizeof(void*) - 1) / sizeof(void*)) * sizeof(void*)); } -#define ALIGN(x) (align(x)) +#define SA_ALIGN(x) (sa_align(x)) #endif |