Mercurial > hg > webserver / changeset

--- 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) $<
-	

--- 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;

--- 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 <stdio.h>
 #include <stdlib.h>
+#include <unistd.h>
+#include <sys/socket.h>
+#include <sys/un.h>
 
 #include "log.h"
 #include "webserver.h"