Commit 8377747d authored by Axel Auweter's avatar Axel Auweter
Browse files

Merge branch 'master' of ssh://deep-ras.srv.lrz.de/git/dcdb

parents ccd37c7f b7a9fa9d
......@@ -22,7 +22,7 @@ PUBHEADERS = $(shell find include -type f -iname "*.h")
PRIVHEADERS = $(shell find include_internal -type f -iname "*.h")
# External libraries to link against
LIBS = -L$(DCDBDEPLOYPATH)/lib/ -lcassandra -lboost_random -lboost_system -lboost_date_time -lboost_regex -luv
LIBS = -L$(DCDBDEPLOYPATH)/lib/ -lcassandra -lboost_random -lboost_system -lboost_date_time -lboost_regex -luv -pthread
# Dynamic library building differs between Linux/BSD and MacOS
OS = $(shell uname)
......
......@@ -64,7 +64,7 @@ DCDB_C_RESULT dcdbQuerySumMultipleThreaded(
time_t start,
time_t end,
DCDB_C_OPTIONS options,
int numThreads
unsigned int numThreads
);
#ifdef __cplusplus
......
......@@ -303,7 +303,7 @@ DCDB_C_RESULT dcdbQuerySumMultipleThreaded(
time_t start,
time_t end,
DCDB_C_OPTIONS options,
int numThreads
unsigned int numThreads
)
{
unsigned int i;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment