Author: mstorsjo Date: Sun Oct 1 13:22:40 2017 New Revision: 314635 URL: http://llvm.org/viewvc/llvm-project?rev=314635&view=rev Log: SjLj: Fix building after SVN r314632
The code moved from Unwind_AppleExtras.cpp to Unwind-sjlj.c needed a few minor modifications to build as C instead of C++. Modified: libunwind/trunk/src/Unwind-sjlj.c Modified: libunwind/trunk/src/Unwind-sjlj.c URL: http://llvm.org/viewvc/llvm-project/libunwind/trunk/src/Unwind-sjlj.c?rev=314635&r1=314634&r2=314635&view=diff ============================================================================== --- libunwind/trunk/src/Unwind-sjlj.c (original) +++ libunwind/trunk/src/Unwind-sjlj.c Sun Oct 1 13:22:40 2017 @@ -67,7 +67,7 @@ struct _Unwind_FunctionContext { #if defined(__APPLE__) #include <System/pthread_machdep.h> #else -static _LIBUNWIND_THREAD_LOCAL _Unwind_FunctionContext *stack = nullptr; +static _LIBUNWIND_THREAD_LOCAL struct _Unwind_FunctionContext *stack = NULL; #endif static struct _Unwind_FunctionContext *__Unwind_SjLj_GetTopOfFunctionStack() { _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits