diff options
| author | yangwei <[email protected]> | 2023-11-08 17:03:05 +0800 |
|---|---|---|
| committer | yangwei <[email protected]> | 2023-11-08 17:03:05 +0800 |
| commit | 3f42d688d6565480ea868a44859ba20178ad1d58 (patch) | |
| tree | 50981c0f26d63e6ec5ddca703966d962bcbc69df /include | |
| parent | fe8e4d942aeb1930b81db04dc0c7fefcb05dfb73 (diff) | |
🦄 refactor(eliminate lint warning): 消除è¯æ³•æ£€æŸ¥å‘Šè¦v4.3.31
Diffstat (limited to 'include')
| -rw-r--r-- | include/private/stream_internal.h | 4 | ||||
| -rw-r--r-- | include/public/sapp_std.h | 5 |
2 files changed, 3 insertions, 6 deletions
diff --git a/include/private/stream_internal.h b/include/private/stream_internal.h index a8261ba..679786f 100644 --- a/include/private/stream_internal.h +++ b/include/private/stream_internal.h @@ -49,9 +49,7 @@ #endif #ifndef container_of -#define container_of(ptr, type, member) ({ \ - const typeof( ((type *)0)->member ) *__mptr = (ptr); \ - (type *)( (char *)__mptr - offsetof(type,member) );}) +#define container_of(ptr, type, member) ((type *)((char *)(ptr) - offsetof(type, member))) #endif #define sapp_get_struct_header(ptr, type, member) container_of(ptr, type, member) diff --git a/include/public/sapp_std.h b/include/public/sapp_std.h index d8670f5..a3810e0 100644 --- a/include/public/sapp_std.h +++ b/include/public/sapp_std.h @@ -45,9 +45,8 @@ typedef struct { #endif #ifndef container_of -#define container_of(ptr, type, member) ({ \ - const typeof( ((type *)0)->member ) *__mptr = (ptr); \ - (type *)( (char *)__mptr - offsetof(type,member) );}) +#define container_of(ptr, type, member) ((type *)((char *)(ptr) - offsetof(type, member))) + #endif #define timeval_delta_ms(start, end) ((end.tv_sec-start.tv_sec)*1000 + (end.tv_usec-start.tv_usec)/1000) |