A number of small build fixes found while looking at mingw support.

[m6w6/libmemcached] / libmemcached / assert.hpp

diff --git a/libmemcached/assert.hpp b/libmemcached/assert.hpp
index 8a46784ed22803a501e7091e2cb1dc628653fe8e..28948c3c0cbfbb23f29fe5c51cbce2ddaff36275 100644 (file)
--- a/libmemcached/assert.hpp
+++ b/libmemcached/assert.hpp
@@ -37,11 +37,8 @@
 
 #pragma once
 
-#include <cstdlib>
-#include <cstdio>
-
 #ifdef NDEBUG
-#define        assert(__expr, __mesg)  ((void)0)
+#define assert_msg(__expr, __mesg) (void)(__expr); (void)(__mesg);
 #else
 
 #define assert_msg(__expr, __mesg) \
@@ -49,7 +46,8 @@ do \
 { \
   if (not (__expr)) \
   { \
-    fprintf(stderr, "\nAssertion \"%s\" failed for function \"%s\" likely for %s, at %s:%d\n", #__expr, __func__, (#__mesg),  __FILE__, __LINE__);\
+    fprintf(stderr, "\n%s:%d Assertion \"%s\" failed for function \"%s\" likely for %s\n", __FILE__, __LINE__, #__expr, __func__, (#__mesg));\
+    custom_backtrace(); \
     abort(); \
   } \
 } while (0)