summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2022-10-10 13:30:41 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2022-10-10 13:30:41 +0000
commit0b5d4a079bf02f0a869afcbad3c20190776d733e (patch)
treefcb31872717a48660af9378c6b1e29fa7b12fb12
parent5e072816e8354d93af3db1aef7a7f4bd8c0d6e8b (diff)
parentc5e1b295bc0f60b4562cd3db0379c0822ed758f1 (diff)
downloadlibglnx-0b5d4a079bf02f0a869afcbad3c20190776d733e.tar.gz
Merge branch 'wip/smcv/g-info' into 'master'
backports: Backport g_info() See merge request GNOME/libglnx!40
-rw-r--r--glnx-backports.h4
-rw-r--r--tests/test-libglnx-macros.c8
2 files changed, 12 insertions, 0 deletions
diff --git a/glnx-backports.h b/glnx-backports.h
index 6f766a3..d109833 100644
--- a/glnx-backports.h
+++ b/glnx-backports.h
@@ -48,6 +48,10 @@ G_BEGIN_DECLS
} G_STMT_END
#endif
+#if !GLIB_CHECK_VERSION(2, 40, 0)
+#define g_info(...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_INFO, __VA_ARGS__)
+#endif
+
#if !GLIB_CHECK_VERSION(2, 44, 0)
#define g_strv_contains glnx_strv_contains
diff --git a/tests/test-libglnx-macros.c b/tests/test-libglnx-macros.c
index 5f41e5b..ec669d3 100644
--- a/tests/test-libglnx-macros.c
+++ b/tests/test-libglnx-macros.c
@@ -27,6 +27,13 @@
#include <string.h>
static void
+test_info (void)
+{
+ g_info ("hello, world");
+ g_info ("answer=%d", 42);
+}
+
+static void
test_inset (void)
{
g_assert (G_IN_SET (7, 7));
@@ -104,6 +111,7 @@ test_hash_table_foreach (void)
int main (int argc, char **argv)
{
g_test_init (&argc, &argv, NULL);
+ g_test_add_func ("/info", test_info);
g_test_add_func ("/inset", test_inset);
g_test_add_func ("/hash_table_foreach", test_hash_table_foreach);
return g_test_run();