From 74419e27b4f03e46f81dca5e5ccb1b1b96b63cb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= Date: Sat, 16 Sep 2023 17:21:54 +0200 Subject: [PATCH] spa: utils: cleanup: only have one version of `spa_clear_ptr()` Depend on `spa_steal_ptr()` for checking if `ptr` is actually a pointer or not. --- spa/include/spa/utils/cleanup.h | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/spa/include/spa/utils/cleanup.h b/spa/include/spa/utils/cleanup.h index e63204c60..5e9b55646 100644 --- a/spa/include/spa/utils/cleanup.h +++ b/spa/include/spa/utils/cleanup.h @@ -53,16 +53,6 @@ __extension__ ({ \ #include - -#if __GNUC__ > 10 || defined(__clang__) -#define spa_clear_ptr(ptr, destructor) \ -__extension__ ({ \ - __typeof__(*(ptr)) *_old_value = spa_steal_ptr(ptr); \ - if (_old_value) \ - destructor(_old_value); \ - (void) 0; \ -}) -#else #define spa_clear_ptr(ptr, destructor) \ __extension__ ({ \ __typeof__(ptr) _old_value = spa_steal_ptr(ptr); \ @@ -70,7 +60,6 @@ __extension__ ({ \ destructor(_old_value); \ (void) 0; \ }) -#endif static inline void _spa_autofree_cleanup_func(void *p) {