Remove skygw_types.h

Some stuff moved to maxscale/utils.h. Further cleanup still needed.

server/core/externcmd.c

@@ -12,6 +12,7 @@
  */
 
 #include <maxscale/externcmd.h>
+#include <ctype.h>
 #include <maxscale/alloc.h>
 
 /**

server/core/log_manager.cc

@@ -29,9 +29,9 @@
 #include <maxscale/mlist.h>
 #include <maxscale/spinlock.h>
 #include <maxscale/debug.h>
-#include <maxscale/skygw_types.h>
 #include <maxscale/skygw_utils.h>
 #include <maxscale/alloc.h>
+#include <maxscale/utils.h>
 
 #define MAX_PREFIXLEN 250
 #define MAX_SUFFIXLEN 250

server/core/service.c

@@ -67,6 +67,7 @@
 #include <maxscale/version.h>
 #include <maxscale/queuemanager.h>
 #include <maxscale/alloc.h>
+#include <maxscale/utils.h>
 
 /** To be used with configuration type checks */
 typedef struct typelib_st
@@ -78,13 +79,13 @@ typedef struct typelib_st
 
 /** Set of subsequent false,true pairs */
 static const char* bool_strings[11]  = {"FALSE", "TRUE", "OFF", "ON", "N", "Y", "0", "1", "NO", "YES", 0};
-typelib_t bool_type  = {array_nelems(bool_strings) - 1, "bool_type", bool_strings};
+typelib_t bool_type  = {MXS_ARRAY_NELEMS(bool_strings) - 1, "bool_type", bool_strings};
 
 /** List of valid values */
 static const char* sqlvar_target_strings[4] = {"MASTER", "ALL", 0};
 typelib_t sqlvar_target_type =
 {
-    array_nelems(sqlvar_target_strings) - 1,
+    MXS_ARRAY_NELEMS(sqlvar_target_strings) - 1,
     "sqlvar_target_type",
     sqlvar_target_strings
 };

server/core/skygw_utils.cc

@@ -15,6 +15,8 @@
 #define PCRE2_CODE_UNIT_WIDTH 8
 #endif
 
+#include <ctype.h>
+#include <math.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <pthread.h>
@@ -24,13 +26,22 @@
 #include <stddef.h>
 #include <regex.h>
 #include <maxscale/debug.h>
-#include <maxscale/skygw_types.h>
 #include <sys/time.h>
 #include <maxscale/skygw_utils.h>
 #include <maxscale/atomic.h>
 #include <maxscale/random_jkiss.h>
 #include <pcre2.h>
 
+#if !defined(PATH_MAX)
+# if defined(__USE_POSIX)
+#   define PATH_MAX _POSIX_PATH_MAX
+# else
+#   define PATH_MAX 256
+# endif
+#endif
+
+#define MAX_ERROR_MSG PATH_MAX
+
 static void simple_mutex_free_memory(simple_mutex_t* sm);
 static void thread_free_memory(skygw_thread_t* th, char* name);
 /** End of static function declarations */