diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2022-04-20 17:25:45 +0400 |
|---|---|---|
| committer | Marc-André Lureau <marcandre.lureau@redhat.com> | 2022-04-21 16:56:55 +0400 |
| commit | 951cc9df88291b275f4db10e6853afd3e2a600c8 (patch) | |
| tree | 0aef072be0c1c9b28502f82ab52830874a3f051d | |
| parent | 9c125d17e9402c232c46610802e5931b3639d77b (diff) | |
| download | focaccia-qemu-951cc9df88291b275f4db10e6853afd3e2a600c8.tar.gz focaccia-qemu-951cc9df88291b275f4db10e6853afd3e2a600c8.zip | |
glib-compat: isolate g_date_time_format_iso8601 version-bypass
The solution was discussed with Markus Armbruster during the review: https://patchew.org/QEMU/20220323155743.1585078-1-marcandre.lureau@redhat.com/20220323155743.1585078-14-marcandre.lureau@redhat.com/ Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Message-Id: <20220420132624.2439741-3-marcandre.lureau@redhat.com>
| -rw-r--r-- | include/glib-compat.h | 10 | ||||
| -rw-r--r-- | util/error-report.c | 6 |
2 files changed, 5 insertions, 11 deletions
diff --git a/include/glib-compat.h b/include/glib-compat.h index dc14d3ec0d..3113a7d2af 100644 --- a/include/glib-compat.h +++ b/include/glib-compat.h @@ -145,16 +145,6 @@ qemu_g_test_slow(void) #define g_test_thorough() qemu_g_test_slow() #define g_test_quick() (!qemu_g_test_slow()) -#if GLIB_CHECK_VERSION(2,62,0) -static inline gchar * -g_date_time_format_iso8601_compat(GDateTime *datetime) -{ - return g_date_time_format_iso8601(datetime); -} - -#define g_date_time_format_iso8601 g_date_time_format_iso8601_compat -#endif - #pragma GCC diagnostic pop #endif diff --git a/util/error-report.c b/util/error-report.c index d9d3ac30cf..4ec7b30bcb 100644 --- a/util/error-report.c +++ b/util/error-report.c @@ -183,9 +183,13 @@ static void print_loc(void) static char * real_time_iso8601(void) { -#if GLIB_CHECK_VERSION(2, 62, 0) +#if GLIB_CHECK_VERSION(2,62,0) g_autoptr(GDateTime) dt = g_date_time_new_from_unix_utc(g_get_real_time()); + /* ignore deprecation warning, since GLIB_VERSION_MAX_ALLOWED is 2.56 */ +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" return g_date_time_format_iso8601(dt); +#pragma GCC diagnostic pop #else GTimeVal tv; g_get_current_time(&tv); |