hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid name clash - change random to random_jkiss

Browse Source
This commit is contained in:
counterpoint
2015-08-26 16:18:08 +01:00
parent 162db13523
commit 820bb4ea00
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/core/CMakeLists.txt
View File

@ -1,5 +1,5 @@
if(BUILD_TESTS OR BUILD_TOOLS) 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) if(WITH_JEMALLOC)
target_link_libraries(fullcore ${JEMALLOC_LIBRARIES}) target_link_libraries(fullcore ${JEMALLOC_LIBRARIES})
elseif(WITH_TCMALLOC) 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 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 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 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) if(WITH_JEMALLOC)
target_link_libraries(maxscale ${JEMALLOC_LIBRARIES}) target_link_libraries(maxscale ${JEMALLOC_LIBRARIES})

4
server/core/random.c → server/core/random_jkiss.c
View File

@ -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 * @verbatim
* Revision History * Revision History
@ -32,7 +32,7 @@
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
#include <random.h> #include <random_jkiss.h>
/* Public domain code for JKISS RNG - Comments added */ /* Public domain code for JKISS RNG - Comments added */
static unsigned int x = 123456789,y = 987654321,z = 43219876,c = 6543217; /* Seed variables */ static unsigned int x = 123456789,y = 987654321,z = 43219876,c = 6543217; /* Seed variables */

2
server/core/secrets.c
View File

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

2
server/core/utils.c
View File

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

2
server/include/random.h → server/include/random_jkiss.h
View File

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

2
utils/skygw_utils.cc
View File

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