From 61c2159e6b482df82f6586dcbe6439be62c5df47 Mon Sep 17 00:00:00 2001 From: Florian Friedrich Date: Thu, 13 Apr 2017 16:57:23 +0200 Subject: [PATCH] Fix building on RasPi shims.h includes shims/lock.h which calls DISPATCH_INTERNAL_CRASH. However this is defined below the include of shims.h in internal.h and hence fails the build. This commit moves the includes of the dependent files below the define of DISPATCH_INTERNAL_CRASH. --- src/internal.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/internal.h b/src/internal.h index 743d0b2c6..3aa5fc134 100644 --- a/src/internal.h +++ b/src/internal.h @@ -624,10 +624,6 @@ _dispatch_fork_becomes_unsafe(void) #define DISPATCH_PERF_MON 0 #endif -/* #includes dependent on internal.h */ -#include "shims.h" -#include "event/event_internal.h" - // Older Mac OS X and iOS Simulator fallbacks #if HAVE_PTHREAD_WORKQUEUES @@ -939,6 +935,10 @@ _dispatch_ktrace_impl(uint32_t code, uint64_t a, uint64_t b, free(_msg); \ } while (0) +/* #includes dependent on internal.h */ +#include "shims.h" +#include "event/event_internal.h" + #define DISPATCH_NO_VOUCHER ((voucher_t)(void*)~0ul) #define DISPATCH_NO_PRIORITY ((pthread_priority_t)~0ul) DISPATCH_ENUM(dispatch_thread_set_self, unsigned long,