summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2015-12-02 15:46:20 +0100
committerSimon Rettberg2015-12-02 15:46:20 +0100
commitba188045f2295ff1e0f9fc4374a8c402548c95e4 (patch)
treef14e7bf7280659ba28da2e7a04ef841a0b83764d
parent[FUSE] Add virtual status file (diff)
downloaddnbd3-ba188045f2295ff1e0f9fc4374a8c402548c95e4.tar.gz
dnbd3-ba188045f2295ff1e0f9fc4374a8c402548c95e4.tar.xz
dnbd3-ba188045f2295ff1e0f9fc4374a8c402548c95e4.zip
[SERVER] Update includes for moved log.h
-rw-r--r--src/server/altservers.c4
-rw-r--r--src/server/globals.c2
-rw-r--r--src/server/helper.h2
-rw-r--r--src/server/image.c2
-rw-r--r--src/server/integrity.c2
-rw-r--r--src/server/locks.c2
-rw-r--r--src/server/net.c2
-rw-r--r--src/server/rpc.c2
-rw-r--r--src/server/server.c2
-rw-r--r--src/server/uplink.c2
10 files changed, 11 insertions, 11 deletions
diff --git a/src/server/altservers.c b/src/server/altservers.c
index bbe33ba..82b4f36 100644
--- a/src/server/altservers.c
+++ b/src/server/altservers.c
@@ -2,12 +2,12 @@
#include "uplink.h"
#include "locks.h"
#include "../shared/sockhelper.h"
-#include "log.h"
+#include "../shared/log.h"
#include "helper.h"
#include "globals.h"
#include "image.h"
#include "../shared/signal.h"
-#include "log.h"
+#include "../shared/log.h"
#include "../shared/protocol.h"
#include <stdlib.h>
#include <unistd.h>
diff --git a/src/server/globals.c b/src/server/globals.c
index a0d6ea9..e7e4435 100644
--- a/src/server/globals.c
+++ b/src/server/globals.c
@@ -1,6 +1,6 @@
#include "globals.h"
#include "ini.h"
-#include "log.h"
+#include "../shared/log.h"
#include "../types.h"
#include <stddef.h>
#include <string.h>
diff --git a/src/server/helper.h b/src/server/helper.h
index e108d81..4ab2134 100644
--- a/src/server/helper.h
+++ b/src/server/helper.h
@@ -2,7 +2,7 @@
#define HELPER_H_
#include "server.h"
-#include "log.h"
+#include "../shared/log.h"
#include <netinet/in.h>
#include <string.h>
#include <errno.h>
diff --git a/src/server/image.c b/src/server/image.c
index 8d2a77f..cd5b47f 100644
--- a/src/server/image.c
+++ b/src/server/image.c
@@ -1,7 +1,7 @@
#include "image.h"
#include "helper.h"
#include "fileutil.h"
-#include "log.h"
+#include "../shared/log.h"
#include "uplink.h"
#include "locks.h"
#include "integrity.h"
diff --git a/src/server/integrity.c b/src/server/integrity.c
index f32fd9c..407bed2 100644
--- a/src/server/integrity.c
+++ b/src/server/integrity.c
@@ -3,7 +3,7 @@
#include "locks.h"
#include "image.h"
#include "globals.h"
-#include "log.h"
+#include "../shared/log.h"
#include "helper.h"
#include <pthread.h>
diff --git a/src/server/locks.c b/src/server/locks.c
index 8c4fcfb..bc8b18e 100644
--- a/src/server/locks.c
+++ b/src/server/locks.c
@@ -15,7 +15,7 @@
#include <stdio.h>
#include <stdlib.h>
#include "globals.h"
-#include "log.h"
+#include "../shared/log.h"
#include "helper.h"
#include "../shared/signal.h"
diff --git a/src/server/net.c b/src/server/net.c
index 4aab050..0745e9b 100644
--- a/src/server/net.c
+++ b/src/server/net.c
@@ -37,7 +37,7 @@
#include "image.h"
#include "uplink.h"
#include "altservers.h"
-#include "log.h"
+#include "../shared/log.h"
#include "helper.h"
#include "../serialize.h"
#include "../config.h"
diff --git a/src/server/rpc.c b/src/server/rpc.c
index 6152d99..48fc009 100644
--- a/src/server/rpc.c
+++ b/src/server/rpc.c
@@ -2,7 +2,7 @@
#include "server.h"
#include "net.h"
#include "uplink.h"
-#include "log.h"
+#include "../shared/log.h"
#include "locks.h"
#include "../shared/sockhelper.h"
#include "helper.h"
diff --git a/src/server/server.c b/src/server/server.c
index f47f208..f7aba2a 100644
--- a/src/server/server.c
+++ b/src/server/server.c
@@ -39,7 +39,7 @@
#include "uplink.h"
#include "net.h"
#include "altservers.h"
-#include "log.h"
+#include "../shared/log.h"
#include "globals.h"
#include "integrity.h"
#include "helper.h"
diff --git a/src/server/uplink.c b/src/server/uplink.c
index 7910dc1..60b1bab 100644
--- a/src/server/uplink.c
+++ b/src/server/uplink.c
@@ -1,6 +1,6 @@
#include "uplink.h"
#include "locks.h"
-#include "log.h"
+#include "../shared/log.h"
#include "../shared/sockhelper.h"
#include "image.h"
#include "helper.h"