From 35cfc01fa2e395111f7d629f00dc06eecf35a709 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Thu, 26 Jul 2018 13:07:04 +0000 Subject: 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 --- rpc/rpc-lib/src/autoscale-threads.c | 2 +- rpc/rpc-lib/src/rpcsvc.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'rpc/rpc-lib') diff --git a/rpc/rpc-lib/src/autoscale-threads.c b/rpc/rpc-lib/src/autoscale-threads.c index 33ba58c490b..4840fd4e971 100644 --- a/rpc/rpc-lib/src/autoscale-threads.c +++ b/rpc/rpc-lib/src/autoscale-threads.c @@ -8,7 +8,7 @@ cases as published by the Free Software Foundation. */ -#include "event.h" +#include "gf-event.h" #include "rpcsvc.h" void diff --git a/rpc/rpc-lib/src/rpcsvc.h b/rpc/rpc-lib/src/rpcsvc.h index 7ed0dca2ad0..c6efa4f5369 100644 --- a/rpc/rpc-lib/src/rpcsvc.h +++ b/rpc/rpc-lib/src/rpcsvc.h @@ -11,7 +11,7 @@ #ifndef _RPCSVC_H #define _RPCSVC_H -#include "event.h" +#include "gf-event.h" #include "rpc-transport.h" #include "logging.h" #include "dict.h" -- cgit