Avoid name clash - change random to random_jkiss

server/core/CMakeLists.txt

@@ -1,5 +1,5 @@
 if(BUILD_TESTS OR BUILD_TOOLS)
-  add_library(fullcore STATIC adminusers.c atomic.c config.c buffer.c dbusers.c dcb.c filter.c gwbitmask.c gw_utils.c hashtable.c hint.c housekeeper.c load_utils.c memlog.c modutil.c monitor.c poll.c resultset.c secrets.c server.c service.c session.c spinlock.c thread.c users.c utils.c gwdirs.c  externcmd.c)
+  add_library(fullcore STATIC adminusers.c atomic.c config.c buffer.c dbusers.c dcb.c filter.c gwbitmask.c gw_utils.c hashtable.c hint.c housekeeper.c load_utils.c memlog.c modutil.c monitor.c poll.c resultset.c secrets.c server.c service.c session.c spinlock.c thread.c users.c utils.c gwdirs.c  externcmd.c random_jkiss.c)
   if(WITH_JEMALLOC)
     target_link_libraries(fullcore ${JEMALLOC_LIBRARIES})
   elseif(WITH_TCMALLOC)
@@ -12,7 +12,7 @@ add_executable(maxscale atomic.c buffer.c spinlock.c gateway.c
 	gw_utils.c utils.c dcb.c load_utils.c session.c service.c server.c 
 	poll.c config.c users.c hashtable.c dbusers.c thread.c gwbitmask.c 
 	monitor.c adminusers.c secrets.c filter.c modutil.c hint.c 
-	housekeeper.c memlog.c resultset.c  gwdirs.c externcmd.c)
+	housekeeper.c memlog.c resultset.c gwdirs.c externcmd.c random_jkiss.c)
 
 if(WITH_JEMALLOC)
   target_link_libraries(maxscale ${JEMALLOC_LIBRARIES})

server/core/random_jkiss.c

@@ -17,7 +17,7 @@
  */
 
 /**
- * @file random.c  -  Random number generator for the MariaDB Corporation MaxScale
+ * @file random_jkiss.c  -  Random number generator for the MariaDB Corporation MaxScale
  *
  * @verbatim
  * Revision History
@@ -32,7 +32,7 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <random.h>
+#include <random_jkiss.h>
 
 /* Public domain code for JKISS RNG - Comments added */
 static unsigned int x = 123456789,y = 987654321,z = 43219876,c = 6543217; /* Seed variables */

server/core/secrets.c

@@ -23,7 +23,7 @@
 #include <ctype.h>
 #include <mysql_client_server_protocol.h>
 #include <gwdirs.h>
-#include <random.h>
+#include <random_jkiss.h>
 
 /** Defined in log_manager.cc */
 extern int            lm_enabled_logfiles_bitmask;

server/core/utils.c

@@ -43,7 +43,7 @@
 #include <skygw_utils.h>
 #include <log_manager.h>
 #include <secrets.h>
-#include <random.h>
+#include <random_jkiss.h>
 
 /** Defined in log_manager.cc */
 extern int            lm_enabled_logfiles_bitmask;

server/include/random_jkiss.h

@@ -1,5 +1,5 @@
 /* 
- * File:   random.h
+ * File:   random_jkiss.h
  * Author: mbrampton
  *
  * Created on 26 August 2015, 15:34

utils/skygw_utils.cc

@@ -30,7 +30,7 @@
 #include <sys/time.h>
 #include "skygw_utils.h"
 #include <atomic.h>
-#include <random.h>
+#include <random_jkiss.h>
 
 #if defined(MLIST)