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

Fixed compilation problems.

Browse Source
This commit is contained in:
Markus Makela
2015-08-26 18:33:46 +03:00
parent b66bcbd36c
commit 70d82fd45e
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/core/CMakeLists.txt
View File

@ -23,11 +23,11 @@ endif()
target_link_libraries(maxscale ${EMBEDDED_LIB} ${PCRE_LINK_FLAGS} ${CURL_LIBRARIES} log_manager utils ssl aio pthread crypt dl crypto inih z rt m stdc++) target_link_libraries(maxscale ${EMBEDDED_LIB} ${PCRE_LINK_FLAGS} ${CURL_LIBRARIES} log_manager utils ssl aio pthread crypt dl crypto inih z rt m stdc++)
install(TARGETS maxscale DESTINATION ${MAXSCALE_BINDIR}) install(TARGETS maxscale DESTINATION ${MAXSCALE_BINDIR})
add_executable(maxkeys maxkeys.c secrets.c utils.c gwdirs.c) add_executable(maxkeys maxkeys.c secrets.c utils.c gwdirs.c random_jkiss.c)
target_link_libraries(maxkeys log_manager utils pthread crypt crypto) target_link_libraries(maxkeys log_manager utils pthread crypt crypto)
install(TARGETS maxkeys DESTINATION ${MAXSCALE_BINDIR}) install(TARGETS maxkeys DESTINATION ${MAXSCALE_BINDIR})
add_executable(maxpasswd maxpasswd.c secrets.c utils.c gwdirs.c) add_executable(maxpasswd maxpasswd.c secrets.c utils.c gwdirs.c random_jkiss.c)
target_link_libraries(maxpasswd log_manager utils pthread crypt crypto) target_link_libraries(maxpasswd log_manager utils pthread crypt crypto)
install(TARGETS maxpasswd DESTINATION ${MAXSCALE_BINDIR}) install(TARGETS maxpasswd DESTINATION ${MAXSCALE_BINDIR})

2
server/core/poll.c
View File

@ -1135,7 +1135,7 @@ poll_dcb_session_check(DCB *dcb)
LOGIF(LE, (skygw_log_write_flush( LOGIF(LE, (skygw_log_write_flush(
LOGFILE_ERROR, LOGFILE_ERROR,
"%lu [%s] The dcb %p that was about to be processed does not " "%lu [%s] The dcb %p that was about to be processed does not "
"have a non-null session pointer " "have a non-null session pointer ",
pthread_self(), pthread_self(),
__func__, __func__,
dcb))); dcb)));

2
server/core/random_jkiss.c
View File

@ -38,6 +38,8 @@
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 */
static bool init = false; static bool init = false;
static void random_init_jkiss();
/*** /***
* *
* Return a random number * Return a random number