From 762196328ab7e60f1d2908fd5a337d2ca99726dd Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 1 Oct 2007 20:12:53 +0000
Subject: add a couple of additional useful macros

git-svn-id: file:///home/lennart/svn/public/libsydney/trunk@33 9ba3c220-e4d3-45a2-8aa3-73fcc9aff6ce
---
 macro.h | 40 ++++++++++++++++++++++++++++++++++++----
 1 file changed, 36 insertions(+), 4 deletions(-)

(limited to 'macro.h')

diff --git a/macro.h b/macro.h
index 5e4be44..d664c3e 100644
--- a/macro.h
+++ b/macro.h
@@ -47,6 +47,13 @@
 
 #define sa_assert assert
 
+/* An assert which guarantees side effects of x */
+#ifdef NDEBUG
+#define sa_assert_se(x) x
+#else
+#define sa_assert_se(x) sa_assert(x)
+#endif
+
 #define sa_assert_not_reached() sa_assert(!"Should not be reached.")
 
 #define sa_assert_success(x) do {               \
@@ -56,13 +63,38 @@
 
 #define SA_ELEMENTSOF(x) (sizeof(x)/sizeof((x)[0]))
 
-#ifndef SA_MAX
-#define SA_MAX(a, b) ((a) > (b) ? (a) : (b))
+#ifndef MAX
+#define MAX(a, b) ((a) > (b) ? (a) : (b))
+#endif
+
+#ifndef MIN
+#define MIN(a, b) ((a) < (b) ? (a) : (b))
+#endif
+
+#ifndef CLAMP
+#define CLAMP(x, low, high)  (((x) > (high)) ? (high) : (((x) < (low)) ? (low) : (x)))
 #endif
-#ifndef SA_MIN
-#define SA_MIN(a, b) ((a) < (b) ? (a) : (b))
+
+#ifndef FALSE
+#define FALSE (0)
+#endif
+
+#ifndef TRUE
+#define TRUE (!FALSE)
 #endif
 
+#define SA_PTR_TO_UINT(p) ((unsigned int) (unsigned long) (p))
+#define SA_UINT_TO_PTR(u) ((void*) (unsigned long) (u))
+
+#define SA_PTR_TO_UINT32(p) ((uint32_t) SA_PTR_TO_UINT(p))
+#define SA_UINT32_TO_PTR(u) SA_UINT_TO_PTR((uint32_t) u)
+
+#define SA_PTR_TO_INT(p) ((int) SA_PTR_TO_UINT(p))
+#define SA_INT_TO_PTR(u) SA_UINT_TO_PTR((int) u)
+
+#define SA_PTR_TO_INT32(p) ((int32_t) SA_PTR_TO_UINT(p))
+#define SA_INT32_TO_PTR(u) SA_UINT_TO_PTR((int32_t) u)
+
 static inline size_t sa_align(size_t l) {
     return (((l + sizeof(void*) - 1) / sizeof(void*)) * sizeof(void*));
 }
-- 
cgit