Merge branch 'develop' into MXS-329-develop-20151111

2015-11-13 07:44:23 +02:00
parent 30d1fc66b7 1433d28f5f
commit 6b88b6b17f
66 changed files with 4807 additions and 4056 deletions
--- a/server/core/test/testsession.c
+++ b/server/core/test/testsession.c
@ -27,6 +27,13 @@
 * @endverbatim
 */

+// To ensure that ss_info_assert asserts also when builing in non-debug mode.
+#if !defined(SS_DEBUG)
+#define SS_DEBUG
+#endif
+#if defined(NDEBUG)
+#undef NDEBUG
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>