diff options
| author | Emmanuele Bassi <ebassi@gmail.com> | 2018-07-11 21:52:31 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gmail.com> | 2018-07-11 21:52:31 +0000 |
| commit | d3881bb1bfff0002e9701be039f3c2d0af4ad203 (patch) | |
| tree | 7f40e7b5ffb3ecf8497239b034e14b64e3bc24e4 /glib | |
| parent | aa6721f1ee0218e5f6c2cd3dd9fee90ed0dadc67 (diff) | |
| download | glib-d3881bb1bfff0002e9701be039f3c2d0af4ad203.tar.gz | |
Revert "Merge branch 'type-safe-g-clear-pointer-1425' into 'master'"
This reverts merge request !165
Diffstat (limited to 'glib')
| -rw-r--r-- | glib/gmem.h | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/glib/gmem.h b/glib/gmem.h index bf262f66e..5cccb045c 100644 --- a/glib/gmem.h +++ b/glib/gmem.h @@ -110,16 +110,6 @@ gpointer g_try_realloc_n (gpointer mem, gsize n_blocks, gsize n_block_bytes) G_GNUC_WARN_UNUSED_RESULT; -#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)) && !defined(__cplusplus) && GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_58 -#define g_clear_pointer(pp, destroy) \ - G_STMT_START { \ - G_STATIC_ASSERT (sizeof *(pp) == sizeof (gpointer)); \ - __typeof__(*(pp)) _ptr = *(pp); \ - *(pp) = NULL; \ - if (_ptr) \ - destroy (_ptr); \ - } G_STMT_END -#else /* __GNUC__ */ #define g_clear_pointer(pp, destroy) \ G_STMT_START { \ G_STATIC_ASSERT (sizeof *(pp) == sizeof (gpointer)); \ @@ -137,7 +127,6 @@ gpointer g_try_realloc_n (gpointer mem, _destroy (_p); \ } \ } G_STMT_END -#endif /* __GNUC__ */ /** * g_steal_pointer: |