summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/fuse/connection.c2
-rw-r--r--src/fuse/connection.h2
-rw-r--r--src/fuse/main.c2
-rw-r--r--src/server/altservers.c2
-rw-r--r--src/server/globals.h2
-rw-r--r--src/server/image.c2
-rw-r--r--src/server/locks.c2
-rw-r--r--src/server/threadpool.c2
-rw-r--r--src/server/uplink.c2
-rw-r--r--src/shared/fdsignal.c (renamed from src/shared/signal.c)8
-rw-r--r--src/shared/fdsignal.h (renamed from src/shared/signal.h)4
-rw-r--r--src/shared/fdsignal.inc/eventfd.c (renamed from src/shared/signal.inc/eventfd.c)0
-rw-r--r--src/shared/fdsignal.inc/pipe64.c (renamed from src/shared/signal.inc/pipe64.c)0
-rw-r--r--src/shared/fdsignal.inc/pipe_malloc.c (renamed from src/shared/signal.inc/pipe_malloc.c)0
14 files changed, 15 insertions, 15 deletions
diff --git a/src/fuse/connection.c b/src/fuse/connection.c
index 65483a5..e2cebb9 100644
--- a/src/fuse/connection.c
+++ b/src/fuse/connection.c
@@ -2,7 +2,7 @@
#include "helper.h"
#include "../config.h"
#include "../shared/protocol.h"
-#include "../shared/signal.h"
+#include "../shared/fdsignal.h"
#include "../shared/sockhelper.h"
#include "../shared/log.h"
diff --git a/src/fuse/connection.h b/src/fuse/connection.h
index f01577d..a97f2cc 100644
--- a/src/fuse/connection.h
+++ b/src/fuse/connection.h
@@ -1,7 +1,7 @@
#ifndef _CONNECTION_H_
#define _CONNECTION_H_
-#include "../shared/signal.h"
+#include "../shared/fdsignal.h"
#include <stdbool.h>
#include <stdint.h>
diff --git a/src/fuse/main.c b/src/fuse/main.c
index cf35596..8c3e0d3 100644
--- a/src/fuse/main.c
+++ b/src/fuse/main.c
@@ -8,7 +8,7 @@
* */
#include "../shared/protocol.h"
-#include "../shared/signal.h"
+#include "../shared/fdsignal.h"
#include "connection.h"
#include "../serialize.h"
#include "helper.h"
diff --git a/src/server/altservers.c b/src/server/altservers.c
index 4ebf2f6..e58d120 100644
--- a/src/server/altservers.c
+++ b/src/server/altservers.c
@@ -6,7 +6,7 @@
#include "helper.h"
#include "globals.h"
#include "image.h"
-#include "../shared/signal.h"
+#include "../shared/fdsignal.h"
#include "../shared/log.h"
#include "../shared/protocol.h"
#include <stdlib.h>
diff --git a/src/server/globals.h b/src/server/globals.h
index 6f9652b..b0dc66a 100644
--- a/src/server/globals.h
+++ b/src/server/globals.h
@@ -2,7 +2,7 @@
#define _GLOBALS_H_
#include "../types.h"
-#include "../shared/signal.h"
+#include "../shared/fdsignal.h"
#include <stdint.h>
#include <time.h>
#include <pthread.h>
diff --git a/src/server/image.c b/src/server/image.c
index 9643abc..7c9680e 100644
--- a/src/server/image.c
+++ b/src/server/image.c
@@ -9,7 +9,7 @@
#include "../shared/sockhelper.h"
#include "altservers.h"
#include "server.h"
-#include "../shared/signal.h"
+#include "../shared/fdsignal.h"
#include <assert.h>
#include <stdio.h>
diff --git a/src/server/locks.c b/src/server/locks.c
index 294f862..4dedb94 100644
--- a/src/server/locks.c
+++ b/src/server/locks.c
@@ -17,7 +17,7 @@
#include "globals.h"
#include "../shared/log.h"
#include "helper.h"
-#include "../shared/signal.h"
+#include "../shared/fdsignal.h"
#define MAXLOCKS 2000
#define MAXTHREADS 500
diff --git a/src/server/threadpool.c b/src/server/threadpool.c
index 12cbe03..dbc23d7 100644
--- a/src/server/threadpool.c
+++ b/src/server/threadpool.c
@@ -1,7 +1,7 @@
#include "globals.h"
#include "helper.h"
#include "threadpool.h"
-#include "../shared/signal.h"
+#include "../shared/fdsignal.h"
#include "locks.h"
#include <pthread.h>
#include <stdlib.h>
diff --git a/src/server/uplink.c b/src/server/uplink.c
index d37cb4f..05405b0 100644
--- a/src/server/uplink.c
+++ b/src/server/uplink.c
@@ -7,7 +7,7 @@
#include "altservers.h"
#include "helper.h"
#include "../shared/protocol.h"
-#include "../shared/signal.h"
+#include "../shared/fdsignal.h"
#include <pthread.h>
#include <sys/socket.h>
diff --git a/src/shared/signal.c b/src/shared/fdsignal.c
index 0107e49..5e81284 100644
--- a/src/shared/signal.c
+++ b/src/shared/fdsignal.c
@@ -1,13 +1,13 @@
-#include "signal.h"
+#include "fdsignal.h"
#if defined(linux) || defined(__linux) || defined(__linux__)
//#warning "Using eventfd based signalling"
-#include "signal.inc/eventfd.c"
+#include "fdsignal.inc/eventfd.c"
#elif __SIZEOF_INT__ == 4 && __SIZEOF_POINTER__ == 8
//#warning "Using pointer-packing pipe based signalling"
-#include "signal.inc/pipe64.c"
+#include "fdsignal.inc/pipe64.c"
#else
//#warning "Using fallback pipe based signalling"
-#include "signal.inc/pipe_malloc.c"
+#include "fdsignal.inc/pipe_malloc.c"
#endif
diff --git a/src/shared/signal.h b/src/shared/fdsignal.h
index 3eea6fb..960a2a9 100644
--- a/src/shared/signal.h
+++ b/src/shared/fdsignal.h
@@ -1,5 +1,5 @@
-#ifndef _SIGNAL_H_
-#define _SIGNAL_H_
+#ifndef _FD_SIGNAL_H_
+#define _FD_SIGNAL_H_
#define SIGNAL_OK (0)
#define SIGNAL_TIMEOUT (-2)
diff --git a/src/shared/signal.inc/eventfd.c b/src/shared/fdsignal.inc/eventfd.c
index b4d4d6e..b4d4d6e 100644
--- a/src/shared/signal.inc/eventfd.c
+++ b/src/shared/fdsignal.inc/eventfd.c
diff --git a/src/shared/signal.inc/pipe64.c b/src/shared/fdsignal.inc/pipe64.c
index 4f0614b..4f0614b 100644
--- a/src/shared/signal.inc/pipe64.c
+++ b/src/shared/fdsignal.inc/pipe64.c
diff --git a/src/shared/signal.inc/pipe_malloc.c b/src/shared/fdsignal.inc/pipe_malloc.c
index b23ddcd..b23ddcd 100644
--- a/src/shared/signal.inc/pipe_malloc.c
+++ b/src/shared/fdsignal.inc/pipe_malloc.c