diff options
| author | Juergen Haug | 2019-10-31 14:38:06 +0000 |
|---|---|---|
| committer | Henrik Rentz-Reichert | 2019-11-11 08:16:13 +0000 |
| commit | 371151cc393c527ee5f9e8732884d4a38c11fdee (patch) | |
| tree | a778b4541df3fa561073bd9dd45719df0b20be64 | |
| parent | fec305de9ef1320952b9dc8fd388db1b42e4afeb (diff) | |
| download | org.eclipse.etrice-371151cc393c527ee5f9e8732884d4a38c11fdee.tar.gz org.eclipse.etrice-371151cc393c527ee5f9e8732884d4a38c11fdee.tar.xz org.eclipse.etrice-371151cc393c527ee5f9e8732884d4a38c11fdee.zip | |
Bug 552599 - [runtime.c] fixed compile issue for linux
<bits/siginfo.h> only included for gcc major <= 4.
Version 5 and newer doesn't seem to need this.
Change-Id: Ifdd5c91ece56a0a527b2d64c92d750741c7148b4
3 files changed, 14 insertions, 5 deletions
diff --git a/gradle/etTest.gradle b/gradle/etTest.gradle index 909f69353..083d5783d 100644 --- a/gradle/etTest.gradle +++ b/gradle/etTest.gradle @@ -61,10 +61,16 @@ ext.createBuild = { lang, name, models, options = [] -> lib project: ':runtime:org.eclipse.etrice.runtime.c', library: 'etrice_runtime_c', linkage: 'static' } binaries.all { - cCompiler.args '-g3', '-std=c99' - cppCompiler.args '-g3', '-std=c99' - if(isFamily(FAMILY_UNIX)) { linker.args '-lpthread', '-lrt', '-lm' } - else if(isFamily(FAMILY_WINDOWS)) { linker.args '-lws2_32' } + if(isFamily(FAMILY_UNIX)) { + cCompiler.args '-g3', '-std=c99', '-lpthread' + cppCompiler.args '-g3', '-std=c99' + linker.args '-lpthread', '-lrt', '-lm' + } + else if(isFamily(FAMILY_WINDOWS)) { + cCompiler.args '-g3', '-std=c99' + cppCompiler.args '-g3', '-std=c99' + linker.args '-lws2_32' + } } } } diff --git a/runtime/org.eclipse.etrice.runtime.c/src/common/debugging/etLogger.c b/runtime/org.eclipse.etrice.runtime.c/src/common/debugging/etLogger.c index a38824ee3..ceee150a9 100644 --- a/runtime/org.eclipse.etrice.runtime.c/src/common/debugging/etLogger.c +++ b/runtime/org.eclipse.etrice.runtime.c/src/common/debugging/etLogger.c @@ -16,6 +16,7 @@ #include "osal/etTime.h" #include <stdarg.h> +#include <string.h> static char* prefixes[] = { "E: ", diff --git a/runtime/org.eclipse.etrice.runtime.c/src/platforms/MT_POSIX_GENERIC_GCC/etDatatypes.h b/runtime/org.eclipse.etrice.runtime.c/src/platforms/MT_POSIX_GENERIC_GCC/etDatatypes.h index c35952a98..8e1787558 100644 --- a/runtime/org.eclipse.etrice.runtime.c/src/platforms/MT_POSIX_GENERIC_GCC/etDatatypes.h +++ b/runtime/org.eclipse.etrice.runtime.c/src/platforms/MT_POSIX_GENERIC_GCC/etDatatypes.h @@ -30,7 +30,9 @@ #include <sys/types.h> #include <unistd.h> #include <signal.h> -#include <bits/siginfo.h> +#if __GNUC__ <= 4 + #include <bits/siginfo.h> +#endif #include <time.h> #include <stdio.h> #include <pthread.h> |