jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-25 11:46:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Berry minor fixes from upstream (#19091)

Browse Source
This commit is contained in:
s-hadinger 2023-07-11 08:21:09 +02:00 committed by GitHub
parent cefd42c820
commit 8c31acd376
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/libesp32/berry/src/be_vector.h
View File

@ -38,7 +38,6 @@ void be_vector_remove_end(bvector *vector);
void be_vector_resize(bvm *vm, bvector *vector, int count); void be_vector_resize(bvm *vm, bvector *vector, int count);
void be_vector_clear(bvector *vector); void be_vector_clear(bvector *vector);
void* be_vector_release(bvm *vm, bvector *vector); void* be_vector_release(bvm *vm, bvector *vector);
void* be_vector_release_32(bvm *vm, bvector *vector); /* specialized call for 32 bits aligned accesses */
int be_nextsize(int value); int be_nextsize(int value);
#endif #endif

15
lib/libesp32/berry/src/berry.h
View File

@ -478,15 +478,18 @@ typedef bclass_ptr bclass_array[];
#endif #endif
/** /**
* @def PROTO_RUNTIME_BLOCK * @def BE_DEBUG_SOURCE_FILE
* @brief conditional block in bproto depending on compilation options * @brief conditional block in bproto depending on compilation options
* *
*/ */
#if BE_SOURCE_FILE #if BE_DEBUG_SOURCE_FILE
#define PROTO_SOURCE_FILE(n) \ #define PROTO_SOURCE_FILE(n) \
((bstring*) _source), /**< source */ ((bstring*) n), /**< source */
#define PROTO_SOURCE_FILE_STR(n) \
be_local_const_str(n##_str_source), /**< source */
#else #else
#define PROTO_SOURCE_FILE(n) #define PROTO_SOURCE_FILE(n)
#define PROTO_SOURCE_FILE_STR(n)
#endif #endif
/** /**
@ -496,8 +499,8 @@ typedef bclass_ptr bclass_array[];
*/ */
#if BE_DEBUG_RUNTIME_INFO #if BE_DEBUG_RUNTIME_INFO
#define PROTO_RUNTIME_BLOCK \ #define PROTO_RUNTIME_BLOCK \
NULL, /**< varinfo */ \ NULL, /**< lineinfo */ \
0, /**< nvarinfo */ 0, /**< nlineinfo */
#else #else
#define PROTO_RUNTIME_BLOCK #define PROTO_RUNTIME_BLOCK
#endif #endif
@ -538,7 +541,7 @@ typedef bclass_ptr bclass_array[];
BE_IIF(_is_subproto)((struct bproto**)&_name##_subproto,NULL), /**< bproto **ptab */ \ BE_IIF(_is_subproto)((struct bproto**)&_name##_subproto,NULL), /**< bproto **ptab */ \
(binstruction*) &_name##_code, /**< code */ \ (binstruction*) &_name##_code, /**< code */ \
be_local_const_str(_name##_str_name), /**< name */ \ be_local_const_str(_name##_str_name), /**< name */ \
be_local_const_str(_name##_str_source), /**< source */ \ PROTO_SOURCE_FILE_STR(_name) /**< source */ \
PROTO_RUNTIME_BLOCK /**< */ \ PROTO_RUNTIME_BLOCK /**< */ \
PROTO_VAR_INFO_BLOCK /**< */ \ PROTO_VAR_INFO_BLOCK /**< */ \
} }