diff options
author | Henrik Rentz-Reichert | 2012-02-15 09:03:01 +0000 |
---|---|---|
committer | Henrik Rentz-Reichert | 2012-02-15 09:03:01 +0000 |
commit | a314ed6ddaf785b94e3083966049d5c928655710 (patch) | |
tree | cf28394877c0789518ecf00e1fe739bcdefe8917 /runtime/org.eclipse.etrice.runtime.c/src/etMessageReceiver.h | |
parent | 37d3b9ee59c1afd95d0f6ab0c61c667cd25dbf55 (diff) | |
parent | e30f9cc595fb5d8ccbb4006b486dbbed7567085c (diff) | |
download | org.eclipse.etrice-a314ed6ddaf785b94e3083966049d5c928655710.tar.gz org.eclipse.etrice-a314ed6ddaf785b94e3083966049d5c928655710.tar.xz org.eclipse.etrice-a314ed6ddaf785b94e3083966049d5c928655710.zip |
Merge remote branch 'refs/remotes/origin/master'
Conflicts:
plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/SubSystemClassGen.java
Diffstat (limited to 'runtime/org.eclipse.etrice.runtime.c/src/etMessageReceiver.h')
-rw-r--r-- | runtime/org.eclipse.etrice.runtime.c/src/etMessageReceiver.h | 46 |
1 files changed, 23 insertions, 23 deletions
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_ */
|