From 464a25c55dfd84877b1842015772ea54b8fe09e4 Mon Sep 17 00:00:00 2001 From: Reuben Dunnington Date: Mon, 21 Aug 2023 11:50:42 -0700 Subject: [PATCH 1/2] fixes for a couple compile errors --- src/runtime.c | 2 +- src/util/lists.h | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/runtime.c b/src/runtime.c index 8c112c9..f1a97cc 100644 --- a/src/runtime.c +++ b/src/runtime.c @@ -313,8 +313,8 @@ void oc_runtime_env_init(oc_runtime_env* runtime) #include "wasmbind/clock_api_bind_gen.c" #include "wasmbind/core_api_bind_gen.c" -#include "wasmbind/gles_api_bind_gen.c" #include "wasmbind/gles_api_bind_manual.c" +#include "wasmbind/gles_api_bind_gen.c" #include "wasmbind/io_api_bind_gen.c" #include "wasmbind/surface_api_bind_gen.c" diff --git a/src/util/lists.h b/src/util/lists.h index b4cd5cb..c09757b 100644 --- a/src/util/lists.h +++ b/src/util/lists.h @@ -1,16 +1,17 @@ -/************************************************************/ /** -* -* @file: lists.h -* @author: Martin Fouilleul -* @date: 22/11/2017 -* @brief: Implements generic intrusive linked list and dynamic array -* +/************************************************************/ /** +* +* @file: lists.h +* @author: Martin Fouilleul +* @date: 22/11/2017 +* @brief: Implements generic intrusive linked list and dynamic array +* ****************************************************************/ #ifndef __CONTAINERS_H_ #define __CONTAINERS_H_ #include "platform/platform_debug.h" #include "util/macros.h" +#include "util/debug.h" #ifdef __cplusplus extern "C" From 513bdacf648341cf111f4c4016b179d60b1bd06c Mon Sep 17 00:00:00 2001 From: Reuben Dunnington Date: Mon, 21 Aug 2023 14:39:09 -0700 Subject: [PATCH 2/2] disable include sorting - we rely on include order in some places --- .clang-format | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.clang-format b/.clang-format index 7b68829..57a457d 100644 --- a/.clang-format +++ b/.clang-format @@ -14,4 +14,5 @@ MaxEmptyLinesToKeep: 1 PointerAlignment: Left SeparateDefinitionBlocks: Always SpaceBeforeParens: Never -ReflowComments: false \ No newline at end of file +ReflowComments: false +SortIncludes: false \ No newline at end of file