From cc27f16061090c335d844d09a2fc0aaae5f745cb Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Fri, 8 Mar 2019 21:59:21 +0100 Subject: [PATCH] Clean up macOS support --- SourceS/macos_stdarg.h | 18 ------------------ SourceS/miniwin.h | 2 +- 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/SourceS/macos_stdarg.h b/SourceS/macos_stdarg.h index 8f545cc00..88e3eef2b 100644 --- a/SourceS/macos_stdarg.h +++ b/SourceS/macos_stdarg.h @@ -1,27 +1,9 @@ -#if defined(__MACH__) #ifndef __STDARG_H #define __STDARG_H -#ifndef _VA_LIST_T typedef __builtin_va_list va_list; #define _VA_LIST_T -#endif #define va_start(ap, param) __builtin_va_start(ap, param) #define va_end(ap) __builtin_va_end(ap) -#define va_arg(ap, type) __builtin_va_arg(ap, type) - -/* GCC always defines __va_copy, but does not define va_copy unless in c99 mode - * or -ansi is not specified, since it was not part of C90. - */ -#define __va_copy(d,s) __builtin_va_copy(d,s) - -#if __STDC_VERSION__ >= 199900L || __cplusplus >= 201103L || !defined(__STRICT_ANSI__) -#define va_copy(dest, src) __builtin_va_copy(dest, src) -#endif - -/* Hack required to make standard headers work, at least on Ubuntu */ -#define __GNUC_VA_LIST 1 -typedef __builtin_va_list __gnuc_va_list; #endif /* __STDARG_H */ -#endif \ No newline at end of file diff --git a/SourceS/miniwin.h b/SourceS/miniwin.h index fe79bc8b8..34295ef77 100644 --- a/SourceS/miniwin.h +++ b/SourceS/miniwin.h @@ -4,7 +4,7 @@ #include #include // work around https://reviews.llvm.org/D51265 -#ifdef __MACH__ +#ifdef __APPLE__ #include "macos_stdarg.h" #else #include