From 7763ab4bcb18be44d3c458d194d786b5a3fb5224 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Tue, 24 Jul 2018 12:45:58 -0700 Subject: [PATCH] Use the FreeBSD __CONCAT. We had the NetBSD __CONCAT macro, despite the fact that our only callers are FreeBSD code. The FreeBSD libm changes in FreeBSD r336665 require the FreeBSD implementation rather than the NetBSD one. Unfortunately for me, that libm code is built in the NDK build too, where it's built against the NDK's . So I need to update __CONCAT first before I can update the libm code. Bug: http://b/111710419 Test: ran tests Change-Id: I70e76e4caab2929c939bfb7009df9fe79d26806a --- libc/include/sys/cdefs.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libc/include/sys/cdefs.h b/libc/include/sys/cdefs.h index 201f40a27..1607c6289 100644 --- a/libc/include/sys/cdefs.h +++ b/libc/include/sys/cdefs.h @@ -94,7 +94,8 @@ #if defined(__STDC__) || defined(__cplusplus) #define __P(protos) protos /* full-blown ANSI C */ -#define __CONCAT(x,y) x ## y +#define __CONCAT1(x,y) x ## y +#define __CONCAT(x,y) __CONCAT1(x,y) #define __STRING(x) #x #if defined(__cplusplus)