Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Schuetz2012-02-19 13:03:15 +0000
committerThomas Schuetz2012-02-19 13:03:15 +0000
commitb27571d3d3623672a7f5de17a2f38d17d004bdc0 (patch)
treec36ab3532f31b37665508b691994f3ec929f576f /runtime
parentee42f0a62cd3443d25aab12f7a8703ae7d58e3b6 (diff)
parent2c4e9e50b4e3acd5408e99f902f362267bb8dd49 (diff)
downloadorg.eclipse.etrice-b27571d3d3623672a7f5de17a2f38d17d004bdc0.tar.gz
org.eclipse.etrice-b27571d3d3623672a7f5de17a2f38d17d004bdc0.tar.xz
org.eclipse.etrice-b27571d3d3623672a7f5de17a2f38d17d004bdc0.zip
Merge branch 'master' of ssh://git.eclipse.org/gitroot/etrice/org.eclipse.etrice
Conflicts: runtime/org.eclipse.etrice.runtime.c/Debug/liborg.eclipse.etrice.runtime.c.a tests/org.eclipse.etrice.generator.c.tests/src/test/runtime/TestEtMessageService.c tests/org.eclipse.etrice.generator.c.tests/tmp/msc.seq tests/org.eclipse.etrice.generator.c.tests/tmp/testlog/TestCRuntime.xml
Diffstat (limited to 'runtime')
-rw-r--r--runtime/org.eclipse.etrice.runtime.c/Debug/liborg.eclipse.etrice.runtime.c.abin130350 -> 129500 bytes
-rw-r--r--runtime/org.eclipse.etrice.runtime.c/src/etMessageReceiver.h46
2 files changed, 23 insertions, 23 deletions
diff --git a/runtime/org.eclipse.etrice.runtime.c/Debug/liborg.eclipse.etrice.runtime.c.a b/runtime/org.eclipse.etrice.runtime.c/Debug/liborg.eclipse.etrice.runtime.c.a
index 837d3c6c3..0190fd62b 100644
--- a/runtime/org.eclipse.etrice.runtime.c/Debug/liborg.eclipse.etrice.runtime.c.a
+++ b/runtime/org.eclipse.etrice.runtime.c/Debug/liborg.eclipse.etrice.runtime.c.a
Binary files differ
diff --git a/runtime/org.eclipse.etrice.runtime.c/src/etMessageReceiver.h b/runtime/org.eclipse.etrice.runtime.c/src/etMessageReceiver.h
index cc82eb3fe..4d5c35680 100644
--- a/runtime/org.eclipse.etrice.runtime.c/src/etMessageReceiver.h
+++ b/runtime/org.eclipse.etrice.runtime.c/src/etMessageReceiver.h
@@ -1,23 +1,23 @@
-/*******************************************************************************
- * Copyright (c) 2012 protos software gmbh (http://www.protos.de).
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * CONTRIBUTORS:
- * Thomas Schuetz (initial contribution)
- *
- *******************************************************************************/
-
-
-
-#ifndef _ETMESSAGERECEIVER_H_
-#define _ETMESSAGERECEIVER_H_
-
-#include "etMessage.h"
-
-typedef void (*etActorReceiveMessage)(void* self, etInt16 localId, const etMessage* msg);
-typedef void (*etDispatcherReceiveMessage)(const etMessage* msg);
-
-#endif /* _ETMESSAGERECEIVER_H_ */
+/*******************************************************************************
+ * Copyright (c) 2012 protos software gmbh (http://www.protos.de).
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * CONTRIBUTORS:
+ * Thomas Schuetz (initial contribution)
+ *
+ *******************************************************************************/
+
+
+
+#ifndef _ETMESSAGERECEIVER_H_
+#define _ETMESSAGERECEIVER_H_
+
+#include "etMessage.h"
+
+typedef void (*etActorReceiveMessage)(void* self, etInt16 localId, const etMessage* msg);
+typedef void (*etDispatcherReceiveMessage)(const etMessage* msg);
+
+#endif /* _ETMESSAGERECEIVER_H_ */

Back to the top