From 0c8f035a500ae0bdaf6ba4536cfe0bdbf3dedc04 Mon Sep 17 00:00:00 2001 From: Joshua Peraza Date: Tue, 10 Jul 2018 14:11:05 -0700 Subject: [PATCH] linux, non-glibc: fix build after eb7d8a4c The pre-processor attempts to parse an entire expression before evaluating sub-expressions, so undefined macros result in a syntax error. Change-Id: Ie950867897a1befd221bdbe4719f2365f5cc75ee Reviewed-on: https://chromium-review.googlesource.com/1132328 Reviewed-by: Robert Sesek Commit-Queue: Joshua Peraza --- compat/linux/sys/user.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/compat/linux/sys/user.h b/compat/linux/sys/user.h index 197c1dd1..0ce5338b 100644 --- a/compat/linux/sys/user.h +++ b/compat/linux/sys/user.h @@ -20,9 +20,11 @@ #include // glibc for 64-bit ARM uses different names for these structs prior to 2.20. -#if defined(__arm64__) && defined(__GLIBC__) && !__GLIBC_PREREQ(2, 20) +#if defined(__arm64__) && defined(__GLIBC__) +#if !__GLIBC_PREREQ(2, 20) using user_regs_struct = user_pt_regs; using user_fpsimd_struct = user_fpsimd_state; #endif +#endif #endif // CRASHPAD_COMPAT_LINUX_SYS_USER_H_