summaryrefslogtreecommitdiffstats
path: root/xlators/protocol
diff options
context:
space:
mode:
authorNiels de Vos <ndevos@redhat.com>2018-07-26 13:07:04 +0000
committerNiels de Vos <ndevos@redhat.com>2018-07-27 17:37:32 +0000
commit35cfc01fa2e395111f7d629f00dc06eecf35a709 (patch)
treed950ccda65f97be4aa40654770fdf6f90ea78689 /xlators/protocol
parent405c6e8a8a64f29b37c154091e1677ef67440e73 (diff)
build: rename event.h to gf-event.h
Newer FreeBSD versions (noticed with 10.3-RELEASE) provide a event.h file that on occasion gets included instead of the libglusterfs file. When this happens, 'struct event_pool' will not be defined and building will fail with errors like: autoscale-threads.c:18:55: error: incomplete definition of type 'struct event_pool' int thread_count = pool->eventthreadcount; ~~~~^ autoscale-threads.c:17:16: note: forward declaration of 'struct event_pool' struct event_pool *pool = ctx->event_pool; ^ This problem is caused by 'pkg-config --cflags uuid' that adds /usr/local/include to the GF_CPPFLAGS. The use of libuuid is preferred so that the contrib/uuid/ directory can be removed. By renaming event.h to gf-event.h there is no conflict between the different event.h files anymore and compiling on FreeBSD works without issues. Change-Id: Ie69f6b8a4f8f8e9630d39a86693eb74674f0f763 Updates: bz#1607319 Signed-off-by: Niels de Vos <ndevos@redhat.com>
Diffstat (limited to 'xlators/protocol')
-rw-r--r--xlators/protocol/client/src/client.c2
-rw-r--r--xlators/protocol/server/src/server.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/xlators/protocol/client/src/client.c b/xlators/protocol/client/src/client.c
index bc1322573e2..cd30ed9637f 100644
--- a/xlators/protocol/client/src/client.c
+++ b/xlators/protocol/client/src/client.c
@@ -15,7 +15,7 @@
#include "glusterfs.h"
#include "statedump.h"
#include "compat-errno.h"
-#include "event.h"
+#include "gf-event.h"
#include "xdr-rpc.h"
#include "glusterfs3.h"
diff --git a/xlators/protocol/server/src/server.c b/xlators/protocol/server/src/server.c
index e4a5bdac1f5..8ff51a1c16d 100644
--- a/xlators/protocol/server/src/server.c
+++ b/xlators/protocol/server/src/server.c
@@ -20,7 +20,7 @@
#include "statedump.h"
#include "defaults.h"
#include "authenticate.h"
-#include "event.h"
+#include "gf-event.h"
#include "events.h"
#include "server-messages.h"
#include "rpc-clnt.h"