From 9ea51d66d3838696ace1136f5d0fef32e7022ce7 Mon Sep 17 00:00:00 2001 From: Jerome St-Louis Date: Wed, 6 Mar 2013 01:27:47 -0500 Subject: [PATCH] compiler/bootstrap: Fixed duplicate definitions of va_list - Should solve Lucid build issues - Also added missing multiple include protection in stdarg.h which is the likely cause --- compiler/bootstrap/ecere/bootstrap/File.c | 2 -- compiler/bootstrap/ecere/bootstrap/System.c | 2 -- compiler/bootstrap/ecere/bootstrap/dataTypes.c | 2 -- compiler/bootstrap/include/stdarg.h | 5 +++++ compiler/bootstrap/libec/bootstrap/ecdefs.c | 3 --- 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/compiler/bootstrap/ecere/bootstrap/File.c b/compiler/bootstrap/ecere/bootstrap/File.c index b4373ef..06146ec 100644 --- a/compiler/bootstrap/ecere/bootstrap/File.c +++ b/compiler/bootstrap/ecere/bootstrap/File.c @@ -325,8 +325,6 @@ int ferror(FILE * stream); int fileno(FILE * stream); -typedef __builtin_va_list va_list; - FILE * eC_stdin(void); FILE * eC_stdout(void); diff --git a/compiler/bootstrap/ecere/bootstrap/System.c b/compiler/bootstrap/ecere/bootstrap/System.c index 5099b09..bd03237 100644 --- a/compiler/bootstrap/ecere/bootstrap/System.c +++ b/compiler/bootstrap/ecere/bootstrap/System.c @@ -286,8 +286,6 @@ long long int strtoll(const char * nptr, char ** endptr, int base); unsigned long long int strtoull(const char * nptr, char ** endptr, int base); -typedef __builtin_va_list va_list; - typedef void FILE; FILE * bsl_stdin(void); diff --git a/compiler/bootstrap/ecere/bootstrap/dataTypes.c b/compiler/bootstrap/ecere/bootstrap/dataTypes.c index d42f37d..9486c13 100644 --- a/compiler/bootstrap/ecere/bootstrap/dataTypes.c +++ b/compiler/bootstrap/ecere/bootstrap/dataTypes.c @@ -323,8 +323,6 @@ long long int strtoll(const char * nptr, char ** endptr, int base); unsigned long long int strtoull(const char * nptr, char ** endptr, int base); -typedef __builtin_va_list va_list; - typedef void FILE; FILE * bsl_stdin(void); diff --git a/compiler/bootstrap/include/stdarg.h b/compiler/bootstrap/include/stdarg.h index 7bb3994..0a1a412 100644 --- a/compiler/bootstrap/include/stdarg.h +++ b/compiler/bootstrap/include/stdarg.h @@ -1,5 +1,10 @@ +#ifndef BSL_STDARG_H +#define BSL_STDARG_H + typedef __builtin_va_list va_list; #define va_start __builtin_va_start #define va_end __builtin_va_end #define va_arg __builtin_va_arg + +#endif diff --git a/compiler/bootstrap/libec/bootstrap/ecdefs.c b/compiler/bootstrap/libec/bootstrap/ecdefs.c index 31979d4..3807eb8 100644 --- a/compiler/bootstrap/libec/bootstrap/ecdefs.c +++ b/compiler/bootstrap/libec/bootstrap/ecdefs.c @@ -1602,9 +1602,6 @@ struct OpTable ops; static struct __ecereNameSpace__ecere__com__Class * __ecereClass_Operand; - -typedef __builtin_va_list va_list; - extern unsigned int parsingType; extern struct Location yylloc; -- 1.8.3.1