From 667051a92be99c7612a196a63f1132fd28c3e2fb Mon Sep 17 00:00:00 2001 From: Seth Poulsen Date: Wed, 28 Mar 2018 12:48:49 -0600 Subject: Fixing redefinition in Fake Headers. (#245) * Removed va_arg definition from one of the fake headers, because it was being defined twice. --- utils/fake_libc_include/_fake_defines.h | 1 - utils/fake_libc_include/_fake_typedefs.h | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'utils/fake_libc_include') diff --git a/utils/fake_libc_include/_fake_defines.h b/utils/fake_libc_include/_fake_defines.h index ac3ab92..35bd4ad 100644 --- a/utils/fake_libc_include/_fake_defines.h +++ b/utils/fake_libc_include/_fake_defines.h @@ -194,7 +194,6 @@ #define true 1 /* va_arg macros and type*/ -typedef int va_list; #define va_start(_ap, _type) __builtin_va_start((_ap)) #define va_arg(_ap, _type) __builtin_va_arg((_ap)) #define va_end(_list) diff --git a/utils/fake_libc_include/_fake_typedefs.h b/utils/fake_libc_include/_fake_typedefs.h index 7ece087..dfcc653 100644 --- a/utils/fake_libc_include/_fake_typedefs.h +++ b/utils/fake_libc_include/_fake_typedefs.h @@ -4,6 +4,7 @@ typedef int size_t; typedef int __builtin_va_list; typedef int __gnuc_va_list; +typedef int va_list; typedef int __int8_t; typedef int __uint8_t; typedef int __int16_t; @@ -150,8 +151,6 @@ typedef int uintmax_t; /* C99 stdbool.h bool type. _Bool is built-in in C99 */ typedef _Bool bool; -typedef int va_list; - /* Mir typedefs */ typedef void* MirEGLNativeWindowType; typedef void* MirEGLNativeDisplayType; -- cgit v1.2.1