Skip to content

Commit

Permalink
Resolve conflict in CPreambleGenerator.
Browse files Browse the repository at this point in the history
Tagging @arengarajan99 since he is working in this part of the code.
  • Loading branch information
petervdonovan committed Mar 8, 2023
1 parent 4828dca commit 9651e03
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions org.lflang/src/org/lflang/generator/c/CPreambleGenerator.java
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ public static String generateIncludeStatements(
code.pr("#include \"include/core/port.h\"");
code.pr("int lf_reactor_c_main(int argc, const char* argv[]);");
if(targetConfig.fedSetupPreamble != null) {
code.pr("#include \"" + relPathHeader + "core/federated/federate.h\"");
code.pr("#include \"" + relPathHeader + "core/federated/net_common.h\"");
code.pr("#include \"include/core/federated/federate.h\"");
code.pr("#include \"include/core/federated/net_common.h\"");
}
if (cppMode || targetConfig.platformOptions.platform == Platform.ARDUINO) {
code.pr("}");
Expand Down

0 comments on commit 9651e03

Please sign in to comment.