From 6554c91b1312013e42b42931ee07b961b7e0cdb0 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Mon, 27 May 2019 18:20:04 +0100 Subject: [PATCH] gutils: Move g_ATEXIT() and g_memmove() definitions from glibconfig.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The definitions weren’t templated in glibconfig.h.in at all, so didn’t vary between configurations of GLib — so they should be in a normal header. Move them to gutils.h and fix the deprecation annotations. Signed-off-by: Philip Withnall --- glib/glibconfig.h.in | 5 ----- glib/gutils.h | 4 ++++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/glib/glibconfig.h.in b/glib/glibconfig.h.in index 2bf6c43c1..7ef8c481d 100644 --- a/glib/glibconfig.h.in +++ b/glib/glibconfig.h.in @@ -108,11 +108,6 @@ typedef unsigned @glib_intptr_type_define@ guintptr; #define G_GINTPTR_FORMAT @gintptr_format@ #define G_GUINTPTR_FORMAT @guintptr_format@ -#ifndef G_DISABLE_DEPRECATED -#define g_ATEXIT(proc) (atexit (proc)) -#define g_memmove(dest,src,len) G_STMT_START { memmove ((dest), (src), (len)); } G_STMT_END -#endif - #define GLIB_MAJOR_VERSION @GLIB_MAJOR_VERSION@ #define GLIB_MINOR_VERSION @GLIB_MINOR_VERSION@ #define GLIB_MICRO_VERSION @GLIB_MICRO_VERSION@ diff --git a/glib/gutils.h b/glib/gutils.h index 352ab6a30..055ca4605 100644 --- a/glib/gutils.h +++ b/glib/gutils.h @@ -194,6 +194,10 @@ gchar *g_format_size (guint64 size); GLIB_DEPRECATED_IN_2_30_FOR(g_format_size) gchar *g_format_size_for_display (goffset size); +#define g_ATEXIT(proc) (atexit (proc)) GLIB_DEPRECATED_MACRO_IN_2_32 +#define g_memmove(dest,src,len) \ + G_STMT_START { memmove ((dest), (src), (len)); } G_STMT_END GLIB_DEPRECATED_MACRO_IN_2_40_FOR(memmove) + #ifndef G_DISABLE_DEPRECATED /** * GVoidFunc: