From 520e51d95133736c1773b0ecbe56593e8bb86aa9 Mon Sep 17 00:00:00 2001 From: Krzysztof Parzyszek Date: Wed, 25 Jan 2017 14:20:30 +0000 Subject: [PATCH] [compiler-rt] Fix xray compilation errors: errno and size_t Include errno.h, and use size_t instead of std::size_t, since stddef.h was included (and not cstddef). llvm-svn: 293057 --- compiler-rt/lib/xray/xray_fdr_logging.h | 2 +- compiler-rt/lib/xray/xray_utils.cc | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/compiler-rt/lib/xray/xray_fdr_logging.h b/compiler-rt/lib/xray/xray_fdr_logging.h index 86c72c259e65..8dd55d5c62ad 100644 --- a/compiler-rt/lib/xray/xray_fdr_logging.h +++ b/compiler-rt/lib/xray/xray_fdr_logging.h @@ -83,7 +83,7 @@ struct FDRLoggingOptions { }; // Flight Data Recorder mode implementation interfaces. -XRayLogInitStatus FDRLogging_init(std::size_t BufferSize, std::size_t BufferMax, +XRayLogInitStatus FDRLogging_init(size_t BufferSize, size_t BufferMax, void *Options, size_t OptionsSize); XRayLogInitStatus FDRLogging_finalize(); void FDRLogging_handleArg0(int32_t FuncId, XRayEntryType Entry); diff --git a/compiler-rt/lib/xray/xray_utils.cc b/compiler-rt/lib/xray/xray_utils.cc index 3170379c8866..02118c4f4b82 100644 --- a/compiler-rt/lib/xray/xray_utils.cc +++ b/compiler-rt/lib/xray/xray_utils.cc @@ -16,6 +16,7 @@ #include "xray_defs.h" #include "xray_flags.h" #include +#include #include #include #include