From 9c84f05a20884b4da857e5558fb00c32baa57915 Mon Sep 17 00:00:00 2001 From: Winford Date: Tue, 21 Nov 2023 14:26:18 -0800 Subject: [PATCH] Rename version.h to avm_version.h In order to allow building Zepher OS ports the `version.h` file needs to be renamed to avoid a collision with the `version.h` header file that part of the zepher core libraries included in all zephyr builds. Signed-off-by: Winford --- src/libAtomVM/CMakeLists.txt | 6 +++--- src/libAtomVM/nifs.c | 2 +- src/platforms/emscripten/src/main.c | 2 +- src/platforms/esp32/main/main.c | 2 +- src/platforms/generic_unix/main.c | 2 +- src/platforms/rp2040/src/main.c | 2 +- src/platforms/stm32/src/main.c | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/libAtomVM/CMakeLists.txt b/src/libAtomVM/CMakeLists.txt index c36102aac..627ac832a 100644 --- a/src/libAtomVM/CMakeLists.txt +++ b/src/libAtomVM/CMakeLists.txt @@ -63,7 +63,7 @@ set(HEADER_FILES trace.h utils.h valueshashtable.h - ${CMAKE_CURRENT_BINARY_DIR}/version.h + ${CMAKE_CURRENT_BINARY_DIR}/avm_version.h ) set(SOURCE_FILES @@ -226,10 +226,10 @@ else() set(ATOMVM_VERSION ${ATOMVM_BASE_VERSION}) endif() -# Add include to directory where version.h is generated so targets linking +# Add include to directory where avm_version.h is generated so targets linking # libAtomVM can access it target_include_directories(libAtomVM PUBLIC ${CMAKE_CURRENT_BINARY_DIR}) -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h) +configure_file(${CMAKE_CURRENT_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/avm_version.h) if (NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Generic") target_link_libraries(libAtomVM PUBLIC libAtomVM${CMAKE_SYSTEM_NAME}-${CMAKE_SYSTEM_PROCESSOR}) diff --git a/src/libAtomVM/nifs.c b/src/libAtomVM/nifs.c index 2e52e1fff..d5be97149 100644 --- a/src/libAtomVM/nifs.c +++ b/src/libAtomVM/nifs.c @@ -32,6 +32,7 @@ #include #include "atomshashtable.h" +#include "avm_version.h" #include "avmpack.h" #include "bif.h" #include "context.h" @@ -51,7 +52,6 @@ #include "sys.h" #include "term.h" #include "utils.h" -#include "version.h" #define MAX_NIF_NAME_LEN 260 #define FLOAT_BUF_SIZE 64 diff --git a/src/platforms/emscripten/src/main.c b/src/platforms/emscripten/src/main.c index 7d7656277..3c168960e 100644 --- a/src/platforms/emscripten/src/main.c +++ b/src/platforms/emscripten/src/main.c @@ -22,6 +22,7 @@ #include #include +#include #include #include #include @@ -29,7 +30,6 @@ #include #include #include -#include #include #include diff --git a/src/platforms/esp32/main/main.c b/src/platforms/esp32/main/main.c index e940e1ab2..4f651b8b2 100644 --- a/src/platforms/esp32/main/main.c +++ b/src/platforms/esp32/main/main.c @@ -26,6 +26,7 @@ #include #include +#include #include #include #include @@ -35,7 +36,6 @@ #include #include #include -#include #include "esp32_sys.h" diff --git a/src/platforms/generic_unix/main.c b/src/platforms/generic_unix/main.c index abdcdd0f0..de22155f2 100644 --- a/src/platforms/generic_unix/main.c +++ b/src/platforms/generic_unix/main.c @@ -27,6 +27,7 @@ #include #include "atom.h" +#include "avm_version.h" #include "avmpack.h" #include "bif.h" #include "context.h" @@ -38,7 +39,6 @@ #include "sys.h" #include "term.h" #include "utils.h" -#include "version.h" void print_help(const char *program_name) { diff --git a/src/platforms/rp2040/src/main.c b/src/platforms/rp2040/src/main.c index f907506dc..d7de40ca1 100644 --- a/src/platforms/rp2040/src/main.c +++ b/src/platforms/rp2040/src/main.c @@ -31,13 +31,13 @@ #pragma GCC diagnostic pop +#include #include #include #include #include #include #include -#include #include "rp2040_sys.h" diff --git a/src/platforms/stm32/src/main.c b/src/platforms/stm32/src/main.c index eb8917b22..dcb074ec7 100644 --- a/src/platforms/stm32/src/main.c +++ b/src/platforms/stm32/src/main.c @@ -31,13 +31,13 @@ #include #include +#include #include #include #include #include #include #include -#include #include "lib/avm_devcfg.h" #include "lib/avm_log.h"