From 3325f3725ec90a46f9ea1dd896deaa5f9d336e76 Mon Sep 17 00:00:00 2001 From: Marek Kraus Date: Sat, 21 Jan 2023 10:08:26 +0100 Subject: [PATCH] Make macOS build working again --- lib/chip/blisp_chip_bl60x.c | 2 +- lib/chip/blisp_chip_bl70x.c | 2 +- tools/blisp/src/common.c | 2 +- tools/blisp/src/util.c | 2 ++ tools/blisp/src/util.h | 5 +---- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/chip/blisp_chip_bl60x.c b/lib/chip/blisp_chip_bl60x.c index 08ba99e..e8ae033 100644 --- a/lib/chip/blisp_chip_bl60x.c +++ b/lib/chip/blisp_chip_bl60x.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -#include +#include #include #include "../../data/bl60x_eflash_loader.h" #include "blisp.h" diff --git a/lib/chip/blisp_chip_bl70x.c b/lib/chip/blisp_chip_bl70x.c index 9af7185..a380720 100644 --- a/lib/chip/blisp_chip_bl70x.c +++ b/lib/chip/blisp_chip_bl70x.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: MIT -#include +#include #include #include "../../data/bl70x_eflash_loader.h" #include "blisp.h" diff --git a/tools/blisp/src/common.c b/tools/blisp/src/common.c index f989297..2aeecba 100644 --- a/tools/blisp/src/common.c +++ b/tools/blisp/src/common.c @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/tools/blisp/src/util.c b/tools/blisp/src/util.c index 140f9ba..eab67ac 100644 --- a/tools/blisp/src/util.c +++ b/tools/blisp/src/util.c @@ -9,6 +9,8 @@ // These are not thread safe, but it doesn't place the responsibility // to free an allocated buffer on the caller.nn +#include + static void util_get_executable_path(char* buffer_out, uint32_t max_size) { assert(max_size >= PATH_MAX); // n.b. 1024 on MacOS. 4K on most Linux. diff --git a/tools/blisp/src/util.h b/tools/blisp/src/util.h index 7c53526..f766fa9 100644 --- a/tools/blisp/src/util.h +++ b/tools/blisp/src/util.h @@ -14,10 +14,7 @@ typedef SSIZE_T ssize_t; #elif defined(__APPLE__) #include #include -#endif - -#ifdef __linux__ -#include +#include #endif ssize_t util_get_binary_folder(char* buffer, uint32_t buffer_size);