diff options
author | Henrik Rentz-Reichert | 2016-05-12 17:58:51 +0000 |
---|---|---|
committer | Henrik Rentz-Reichert | 2016-05-12 17:58:51 +0000 |
commit | ca194fc0bb7fefa1f5c2b38293454b7e5d6f9e48 (patch) | |
tree | 311dcd83ec65f27140579a7e1a20675fcb66e3ae /runtime/org.eclipse.etrice.modellib.c | |
parent | 63fc31c930f81b2d6350d759bde58356835b24ea (diff) | |
download | org.eclipse.etrice-ca194fc0bb7fefa1f5c2b38293454b7e5d6f9e48.tar.gz org.eclipse.etrice-ca194fc0bb7fefa1f5c2b38293454b7e5d6f9e48.tar.xz org.eclipse.etrice-ca194fc0bb7fefa1f5c2b38293454b7e5d6f9e48.zip |
some adjustments in C projects and generators to be ANSI compatible
Change-Id: I800802f1c88cc96785af7e06bffaead138556724
Diffstat (limited to 'runtime/org.eclipse.etrice.modellib.c')
-rw-r--r-- | runtime/org.eclipse.etrice.modellib.c/.cproject | 14 | ||||
-rw-r--r-- | runtime/org.eclipse.etrice.modellib.c/model/TcpService.room | 6 |
2 files changed, 10 insertions, 10 deletions
diff --git a/runtime/org.eclipse.etrice.modellib.c/.cproject b/runtime/org.eclipse.etrice.modellib.c/.cproject index 3637b3de5..ac67be3af 100644 --- a/runtime/org.eclipse.etrice.modellib.c/.cproject +++ b/runtime/org.eclipse.etrice.modellib.c/.cproject @@ -12,13 +12,13 @@ </externalSetting> </externalSettings> <extensions> + <extension id="org.eclipse.cdt.core.PE" point="org.eclipse.cdt.core.BinaryParser"/> <extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/> <extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/> - <extension id="org.eclipse.cdt.core.PE" point="org.eclipse.cdt.core.BinaryParser"/> </extensions> </storageModule> <storageModule moduleId="cdtBuildSystem" version="4.0.0"> - <configuration artifactExtension="a" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.staticLib" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.staticLib" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.mingw.lib.debug.847049798" name="WindowsMinGW" parent="cdt.managedbuild.config.gnu.mingw.lib.debug"> + <configuration artifactExtension="a" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.staticLib" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.staticLib,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.mingw.lib.debug.847049798" name="WindowsMinGW" parent="cdt.managedbuild.config.gnu.mingw.lib.debug"> <folderInfo id="cdt.managedbuild.config.gnu.mingw.lib.debug.847049798." name="/" resourcePath=""> <toolChain id="cdt.managedbuild.toolchain.gnu.mingw.lib.debug.384751993" name="MinGW GCC" superClass="cdt.managedbuild.toolchain.gnu.mingw.lib.debug"> <targetPlatform id="cdt.managedbuild.target.gnu.platform.mingw.lib.debug.890594653" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.mingw.lib.debug"/> @@ -49,7 +49,7 @@ <listOptionValue builtIn="false" value=""${workspace_loc:/org.eclipse.etrice.runtime.c/src/util}""/> <listOptionValue builtIn="false" value=""${workspace_loc:/${ProjName}/src-gen}""/> </option> - <option id="gnu.c.compiler.option.dialect.std.2005279778" superClass="gnu.c.compiler.option.dialect.std" value="gnu.c.compiler.dialect.c99" valueType="enumerated"/> + <option id="gnu.c.compiler.option.dialect.std.2005279778" name="Language standard" superClass="gnu.c.compiler.option.dialect.std" value="gnu.c.compiler.dialect.default" valueType="enumerated"/> <inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.161900119" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/> </tool> <tool id="cdt.managedbuild.tool.gnu.c.linker.mingw.base.1011028586" name="MinGW C Linker" superClass="cdt.managedbuild.tool.gnu.c.linker.mingw.base"/> @@ -86,15 +86,15 @@ </externalSetting> </externalSettings> <extensions> + <extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/> <extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/> <extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/> <extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/> <extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/> - <extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/> </extensions> </storageModule> <storageModule moduleId="cdtBuildSystem" version="4.0.0"> - <configuration artifactExtension="a" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.staticLib" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.staticLib" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.mingw.lib.debug.847049798.58778989" name="LinuxPosix" parent="cdt.managedbuild.config.gnu.mingw.lib.debug"> + <configuration artifactExtension="a" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.staticLib" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.staticLib,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.mingw.lib.debug.847049798.58778989" name="LinuxPosix" parent="cdt.managedbuild.config.gnu.mingw.lib.debug"> <folderInfo id="cdt.managedbuild.config.gnu.mingw.lib.debug.847049798.58778989." name="/" resourcePath=""> <toolChain id="cdt.managedbuild.toolchain.gnu.base.983079348" name="Linux GCC" superClass="cdt.managedbuild.toolchain.gnu.base"> <targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="cdt.managedbuild.target.gnu.platform.base.938930980" name="Debug Platform" osList="linux,hpux,aix,qnx" superClass="cdt.managedbuild.target.gnu.platform.base"/> @@ -162,15 +162,15 @@ </externalSetting> </externalSettings> <extensions> + <extension id="org.eclipse.cdt.core.PE" point="org.eclipse.cdt.core.BinaryParser"/> <extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/> <extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/> <extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/> <extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/> - <extension id="org.eclipse.cdt.core.PE" point="org.eclipse.cdt.core.BinaryParser"/> </extensions> </storageModule> <storageModule moduleId="cdtBuildSystem" version="4.0.0"> - <configuration artifactExtension="a" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.staticLib" buildProperties="org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug,org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.staticLib" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.mingw.lib.debug.847049798.1261968101" name="ExternalMakefile" parent="cdt.managedbuild.config.gnu.mingw.lib.debug"> + <configuration artifactExtension="a" artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.staticLib" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.staticLib,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.mingw.lib.debug.847049798.1261968101" name="ExternalMakefile" parent="cdt.managedbuild.config.gnu.mingw.lib.debug"> <folderInfo id="cdt.managedbuild.config.gnu.mingw.lib.debug.847049798.1261968101." name="/" resourcePath=""> <toolChain id="cdt.managedbuild.toolchain.gnu.mingw.lib.debug.1549827107" name="MinGW GCC" superClass="cdt.managedbuild.toolchain.gnu.mingw.lib.debug"> <targetPlatform id="cdt.managedbuild.target.gnu.platform.mingw.lib.debug.1871516802" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.mingw.lib.debug"/> diff --git a/runtime/org.eclipse.etrice.modellib.c/model/TcpService.room b/runtime/org.eclipse.etrice.modellib.c/model/TcpService.room index 0c5a477ac..4a828dc3b 100644 --- a/runtime/org.eclipse.etrice.modellib.c/model/TcpService.room +++ b/runtime/org.eclipse.etrice.modellib.c/model/TcpService.room @@ -284,7 +284,7 @@ RoomModel room.basic.service.tcp { } Operation setAsString(value : charPtr){ - "// used macros: data, length" + "/* used macros: data, length */" "int valLength = (strlen(value)+1 > 32)? 32 : strlen(value) + 1;" "memcpy(data, value, valLength);" "data[31] = '\\0';" @@ -292,13 +292,13 @@ RoomModel room.basic.service.tcp { } Operation setData(value : int8 ref, size : int32){ - "// used macros: data, length" + "/* used macros: data, length */" "strncpy(data, value, ((size>32)?32:size));" "length = size;" } Operation getAsString() : charPtr{ - "// used macros: data" + "/* used macros: data */" "data[31] = '\\0';" "return data;" } |