From d78953151a0e248bb8a91508a6e4b19700128d1c Mon Sep 17 00:00:00 2001
From: Brad Nelson <flagxor@gmail.com>
Date: Sat, 14 Jan 2023 23:14:01 -0800
Subject: [PATCH] Tweaking include order to avoid b0, b1, etc. macro clash,
 bump version.

---
 Makefile           | 2 +-
 esp32/builtins.cpp | 1 +
 esp32/sim_main.cpp | 2 +-
 esp32/template.ino | 1 -
 posix/main.c       | 2 +-
 windows/main.c     | 2 +-
 6 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index b039eff..8be2f6e 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-VERSION=7.0.7.7
+VERSION=7.0.7.8
 STABLE_VERSION=7.0.6.19
 OLD_STABLE_VERSION=7.0.5.4
 REVISION=$(shell git rev-parse HEAD | head -c 20)
diff --git a/esp32/builtins.cpp b/esp32/builtins.cpp
index 683478e..251732f 100644
--- a/esp32/builtins.cpp
+++ b/esp32/builtins.cpp
@@ -18,6 +18,7 @@ static char filename2[PATH_MAX];
 {{bits}}
 {{core}}
 {{faults}}
+{{calling}}
 {{interp}}
 {{boot}}
 
diff --git a/esp32/sim_main.cpp b/esp32/sim_main.cpp
index 39c45f3..c3e681f 100644
--- a/esp32/sim_main.cpp
+++ b/esp32/sim_main.cpp
@@ -18,7 +18,6 @@
 #include "common/tier2_opcodes.h"
 #include "common/floats.h"
 #include "common/calls.h"
-#include "common/calling.h"
 
 #define SIM_HEAP_SIZE (100 * 1024 + 1024 * 1024)
 
@@ -47,6 +46,7 @@ PLATFORM_SIMULATED_OPCODE_LIST
 
 #include "common/bits.h"
 #include "common/core.h"
+#include "common/calling.h"
 #include "common/interp.h"
 #include "gen/esp32_boot.h"
 #include "esp32/main.cpp"
diff --git a/esp32/template.ino b/esp32/template.ino
index 3997d48..b422167 100644
--- a/esp32/template.ino
+++ b/esp32/template.ino
@@ -25,7 +25,6 @@
 {{tier2_opcodes}}
 {{floats}}
 {{calls}}
-{{calling}}
 {{builtins.h}}
 {{builtins.cpp}}
 {{main.cpp}}
diff --git a/posix/main.c b/posix/main.c
index 2252ee6..9c5cfce 100644
--- a/posix/main.c
+++ b/posix/main.c
@@ -19,7 +19,6 @@
 #include "common/tier1_opcodes.h"
 #include "common/tier2_opcodes.h"
 #include "common/floats.h"
-#include "common/calling.h"
 #include "common/calls.h"
 
 #define HEAP_SIZE (10 * 1024 * 1024)
@@ -35,6 +34,7 @@
 #include "common/bits.h"
 #include "common/core.h"
 #include "posix/faults.h"
+#include "common/calling.h"
 #include "common/interp.h"
 
 #include "gen/posix_boot.h"
diff --git a/windows/main.c b/windows/main.c
index f65fdad..8935133 100644
--- a/windows/main.c
+++ b/windows/main.c
@@ -31,7 +31,6 @@
 #include "common/tier1_opcodes.h"
 #include "common/tier2_opcodes.h"
 #include "common/floats.h"
-#include "common/calling.h"
 #include "common/calls.h"
 
 #define HEAP_SIZE (10 * 1024 * 1024)
@@ -53,6 +52,7 @@ static void SetupCtrlBreakHandler(void);
 
 #include "common/bits.h"
 #include "common/core.h"
+#include "common/calling.h"
 #include "windows/interp.h"
 
 #include "gen/windows_boot.h"