From 0dc52e219c8b8355e1db5c36047fa94e4691dd42 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marc-Andr=C3=A9=20Moreau?= Date: Fri, 15 Feb 2013 10:33:21 -0500 Subject: [PATCH] libwinpr-interlocked: fix iOS build --- client/iOS/.gitignore | 1 + winpr/include/winpr/interlocked.h | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/client/iOS/.gitignore b/client/iOS/.gitignore index fe0e7b0..8bcaf57 100644 --- a/client/iOS/.gitignore +++ b/client/iOS/.gitignore @@ -1,4 +1,5 @@ # XCode files +DerivedData project.xcworkspace/ xcuserdata/ bin/ diff --git a/winpr/include/winpr/interlocked.h b/winpr/include/winpr/interlocked.h index c9a798b..0fea91a 100644 --- a/winpr/include/winpr/interlocked.h +++ b/winpr/include/winpr/interlocked.h @@ -23,9 +23,15 @@ #include #include #include +#include #ifndef _WIN32 +/* workaround for SLIST_ENTRY conflict */ + +#include +#undef SLIST_ENTRY + #ifndef CONTAINING_RECORD #define CONTAINING_RECORD(address, type, field) \ ((type *)(((ULONG_PTR) address) - (ULONG_PTR)(&(((type *) 0)->field)))) -- 2.7.4