From 228dcbe0ce9f21ec32d371ded16ae898f624d2e7 Mon Sep 17 00:00:00 2001
From: Johan Wikman <johan.wikman@mariadb.com>
Date: Tue, 14 Aug 2018 16:13:05 +0300
Subject: [PATCH] MXS-2013 Minor cleanup of maxscale/debug.h

Removal of unnecessary include files had ripple effects.
---
 include/maxscale/debug.h          | 45 ++++++++++++++++---------------
 include/maxscale/semaphore.hh     |  5 ++--
 server/core/test/test_log.cc      |  1 +
 server/core/test/test_logorder.cc |  1 +
 4 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/include/maxscale/debug.h b/include/maxscale/debug.h
index 533fe3e6b..d150c923f 100644
--- a/include/maxscale/debug.h
+++ b/include/maxscale/debug.h
@@ -13,39 +13,40 @@
  */
 
 #include <maxscale/cdefs.h>
-#include <limits.h>
 #include <signal.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <pthread.h>
 #include <maxscale/log_manager.h>
 
 MXS_BEGIN_DECLS
 
 #if defined(SS_DEBUG)
-#include <maxscale/log_manager.h>
-# define ss_dassert(exp) do { if(!(exp)){\
-        const char *debug_expr = #exp;  /** The MXS_ERROR marco doesn't seem to like stringification */ \
-        MXS_ERROR("debug assert at %s:%d failed: %s\n", (char*)__FILE__, __LINE__, debug_expr); \
-        fprintf(stderr, "debug assert at %s:%d failed: %s\n", (char*)__FILE__, __LINE__, debug_expr); \
-        raise(SIGABRT);} } while (false)
+
+#define ss_dassert(exp) do { if(!(exp)){\
+            const char *debug_expr = #exp;  /** The MXS_ERROR marco doesn't seem to like stringification */ \
+            MXS_ERROR("debug assert at %s:%d failed: %s\n", (char*)__FILE__, __LINE__, debug_expr); \
+            fprintf(stderr, "debug assert at %s:%d failed: %s\n", (char*)__FILE__, __LINE__, debug_expr); \
+            raise(SIGABRT);} } while (false)
 #define ss_info_dassert(exp,info) do { if(!(exp)){\
-        const char *debug_expr = #exp; \
-        MXS_ERROR("debug assert at %s:%d failed: %s (%s)\n", (char*)__FILE__, __LINE__, info, debug_expr); \
-        fprintf(stderr, "debug assert at %s:%d failed: %s (%s)\n", (char*)__FILE__, __LINE__, info, debug_expr); \
-        raise(SIGABRT);} } while (false)
-# define ss_debug(exp) exp
-# define ss_dfprintf fprintf
-# define ss_dfflush  fflush
-# define ss_dfwrite  fwrite
+            const char *debug_expr = #exp; \
+            MXS_ERROR("debug assert at %s:%d failed: %s (%s)\n", (char*)__FILE__, __LINE__, info, debug_expr); \
+            fprintf(stderr, "debug assert at %s:%d failed: %s (%s)\n", (char*)__FILE__, __LINE__, info, debug_expr); \
+            raise(SIGABRT);} } while (false)
+
+#define ss_debug(exp) exp
+#define ss_dfprintf fprintf
+#define ss_dfflush  fflush
+#define ss_dfwrite  fwrite
+
 #else /* SS_DEBUG */
 
-# define ss_debug(exp)
-# define ss_dfprintf(a, b, ...)
-# define ss_dfflush(s)
-# define ss_dfwrite(a, b, c, d)
-# define ss_dassert(exp)
-# define ss_info_dassert(exp, info)
+#define ss_dassert(exp)
+#define ss_info_dassert(exp, info)
+
+#define ss_debug(exp)
+#define ss_dfprintf(a, b, ...)
+#define ss_dfflush(s)
+#define ss_dfwrite(a, b, c, d)
 
 #endif /* SS_DEBUG */
 
diff --git a/include/maxscale/semaphore.hh b/include/maxscale/semaphore.hh
index 0ae95d4da..b860f17a1 100644
--- a/include/maxscale/semaphore.hh
+++ b/include/maxscale/semaphore.hh
@@ -13,8 +13,9 @@
  */
 
 #include <maxscale/ccdefs.hh>
-#include <errno.h>
-#include <maxbase/semaphore.h>
+#include <cerrno>
+#include <climits>
+#include <maxscale/semaphore.h>
 #include <maxscale/debug.h>
 
 namespace maxscale
diff --git a/server/core/test/test_log.cc b/server/core/test/test_log.cc
index 7b0024be2..f7a415921 100644
--- a/server/core/test/test_log.cc
+++ b/server/core/test/test_log.cc
@@ -18,6 +18,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 #include <maxscale/alloc.h>
 #include <maxscale/log_manager.h>
 #include <maxscale/debug.h>
diff --git a/server/core/test/test_logorder.cc b/server/core/test/test_logorder.cc
index 110e613cf..677a180fb 100644
--- a/server/core/test/test_logorder.cc
+++ b/server/core/test/test_logorder.cc
@@ -15,6 +15,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <time.h>
 #include <maxscale/alloc.h>
 #include <maxscale/debug.h>
 #include <maxscale/log_manager.h>