luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-25 08:36:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1847-log-structured-max-version' into 'master'

Browse Source 
gmessages: Only use structured logs if GLIB_VERSION_MAX_ALLOWED is ≥2.56

Closes #1847

See merge request GNOME/glib!1008
This commit is contained in:
Emmanuele Bassi 2019-07-28 10:49:57 +00:00
commit d62cabc624
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glib/gmessages.h
View File

@ -296,7 +296,7 @@ void g_log_structured_standard (const gchar *log_domain,
#endif /* G_LOG_DOMAIN */ #endif /* G_LOG_DOMAIN */
#if defined(G_HAVE_ISO_VARARGS) && !G_ANALYZER_ANALYZING #if defined(G_HAVE_ISO_VARARGS) && !G_ANALYZER_ANALYZING
#ifdef G_LOG_USE_STRUCTURED #if defined(G_LOG_USE_STRUCTURED) && GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_56
#define g_error(...) G_STMT_START { \ #define g_error(...) G_STMT_START { \
g_log_structured_standard (G_LOG_DOMAIN, G_LOG_LEVEL_ERROR, \ g_log_structured_standard (G_LOG_DOMAIN, G_LOG_LEVEL_ERROR, \
__FILE__, G_STRINGIFY (__LINE__), \ __FILE__, G_STRINGIFY (__LINE__), \
@ -345,7 +345,7 @@ void g_log_structured_standard (const gchar *log_domain,
__VA_ARGS__) __VA_ARGS__)
#endif #endif
#elif defined(G_HAVE_GNUC_VARARGS) && !G_ANALYZER_ANALYZING #elif defined(G_HAVE_GNUC_VARARGS) && !G_ANALYZER_ANALYZING
#ifdef G_LOG_USE_STRUCTURED #if defined(G_LOG_USE_STRUCTURED) && GLIB_VERSION_MAX_ALLOWED >= GLIB_VERSION_2_56
#define g_error(format...) G_STMT_START { \ #define g_error(format...) G_STMT_START { \
g_log_structured_standard (G_LOG_DOMAIN, G_LOG_LEVEL_ERROR, \ g_log_structured_standard (G_LOG_DOMAIN, G_LOG_LEVEL_ERROR, \
__FILE__, G_STRINGIFY (__LINE__), \ __FILE__, G_STRINGIFY (__LINE__), \