X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcommon%2Fmacros.h;h=f242da481b6f8c7c47ddf30064894b3ef35564e8;hb=070b6a86970c981e8f79cbd3dc199008b25cc0dc;hp=33ada7321801a14b438a27dca246ec8fbfb0c897;hpb=eac6ee118d39b8fd835c9afa1a1e2b6ff70c7eb6;p=lttng-tools.git

diff --git a/src/common/macros.h b/src/common/macros.h
index 33ada7321..f242da481 100644
--- a/src/common/macros.h
+++ b/src/common/macros.h
@@ -72,13 +72,17 @@ void *zmalloc(size_t len)
 #endif
 
 #ifndef max_t
-#define max_t(type, a, b)	((type) max(a, b))
+#define max_t(type, a, b)	max((type) a, (type) b)
 #endif
 
 #ifndef min
 #define min(a, b) ((a) < (b) ? (a) : (b))
 #endif
 
+#ifndef min_t
+#define min_t(type, a, b)	min((type) a, (type) b)
+#endif
+
 #ifndef LTTNG_PACKED
 #define LTTNG_PACKED __attribute__((__packed__))
 #endif
@@ -102,6 +106,8 @@ void *zmalloc(size_t len)
 
 #define member_sizeof(type, field)	sizeof(((type *) 0)->field)
 
+#define ASSERT_LOCKED(lock) assert(pthread_mutex_trylock(&lock))
+
 /*
  * lttng_strncpy returns 0 on success, or nonzero on failure.
  * It checks that the @src string fits into @dst_len before performing