# HG changeset patch # User Olaf Wintermann # Date 1488812760 -3600 # Node ID f2268fcbe4877c101167d159c492394132782c3b # Parent 9823770ba4ee4170998a0a2e1b9d63091b547d0f fixes linux build diff -r 9823770ba4ee -r f2268fcbe487 src/server/config/Makefile --- a/src/server/config/Makefile Mon Mar 06 15:43:28 2017 +0100 +++ b/src/server/config/Makefile Mon Mar 06 16:06:00 2017 +0100 @@ -27,8 +27,5 @@ # $(CONF_OBJPRE)%.o: config/%.c - $(CC) -o $@ -c $(CFLAGS) $< + $(CC) -o $@ -c $(CFLAGS) $(SHLIB_CFLAGS) $< -$(CONF_OBJPRE)%.o: config/%.cpp - $(CXX) -o $@ -c $(CFLAGS) $< - diff -r 9823770ba4ee -r f2268fcbe487 src/server/daemon/log.c --- a/src/server/daemon/log.c Mon Mar 06 15:43:28 2017 +0100 +++ b/src/server/daemon/log.c Mon Mar 06 16:06:00 2017 +0100 @@ -242,11 +242,11 @@ pthread_mutex_unlock(&mutex); } -void log_remove_logdup(LogDup *dup) { +void log_remove_logdup(LogDup *ldup) { pthread_mutex_lock(&mutex); UcxList *elm = log_dup_list; while(elm) { - if(elm->data = dup) { + if(elm->data == ldup) { log_dup_list = ucx_list_remove(log_dup_list, elm); ws_atomic_dec32(&log_dup_count); break; diff -r 9823770ba4ee -r f2268fcbe487 src/server/daemon/srvctrl.c --- a/src/server/daemon/srvctrl.c Mon Mar 06 15:43:28 2017 +0100 +++ b/src/server/daemon/srvctrl.c Mon Mar 06 16:06:00 2017 +0100 @@ -28,6 +28,9 @@ #include #include +#include +#include +#include #include "log.h" #include "webserver.h"