From 5b066cf2946b8e57eb24676feb30be812fce2b01 Mon Sep 17 00:00:00 2001 From: Hans Wennborg Date: Tue, 14 Oct 2014 23:20:25 +0000 Subject: [PATCH] vadefs.h: be even more conservative and only define the macros if already defined git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@219745 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Headers/vadefs.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/Headers/vadefs.h b/lib/Headers/vadefs.h index 85cbfc37a3..cb997fbf66 100644 --- a/lib/Headers/vadefs.h +++ b/lib/Headers/vadefs.h @@ -34,17 +34,16 @@ /* Override macros from vadefs.h with definitions that work with Clang. */ #ifdef _crt_va_start #undef _crt_va_start +#define _crt_va_start(ap, param) __builtin_va_start(ap, param) #endif #ifdef _crt_va_end #undef _crt_va_end +#define _crt_va_end(ap) __builtin_va_end(ap) #endif #ifdef _crt_va_arg #undef _crt_va_arg -#endif - -#define _crt_va_start(ap, param) __builtin_va_start(ap, param) -#define _crt_va_end(ap) __builtin_va_end(ap) #define _crt_va_arg(ap, type) __builtin_va_arg(ap, type) +#endif #endif #endif -- 2.40.0