From 786f379d784760431a4d548fd2c98d9b9b221b62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=98yvind=20Kol=C3=A5s?= Date: Sat, 20 May 2023 12:39:46 +0200 Subject: [PATCH] gio/tests: avoid shadowing of libc names under bionic libc Makes the tests compile using clang with meson directly under termux on android, this build environment does not approve of overloading libc symbols. Fixes: #3008 foo --- gio/tests/basic-application.c | 10 +++++----- gio/tests/gapplication-example-open.c | 10 +++++----- gio/tests/gtlsconsoleinteraction.c | 5 ++++- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/gio/tests/basic-application.c b/gio/tests/basic-application.c index 362b2fd51..a58d812a5 100644 --- a/gio/tests/basic-application.c +++ b/gio/tests/basic-application.c @@ -74,10 +74,10 @@ activate (GApplication *application) } static void -open (GApplication *application, - GFile **files, - gint n_files, - const gchar *hint) +app_open (GApplication *application, + GFile **files, + gint n_files, + const gchar *hint) { gint i; @@ -249,7 +249,7 @@ main (int argc, char **argv) : G_APPLICATION_HANDLES_OPEN)); g_signal_connect (app, "startup", G_CALLBACK (startup), NULL); g_signal_connect (app, "activate", G_CALLBACK (activate), NULL); - g_signal_connect (app, "open", G_CALLBACK (open), NULL); + g_signal_connect (app, "open", G_CALLBACK (app_open), NULL); g_signal_connect (app, "command-line", G_CALLBACK (command_line), NULL); #ifdef STANDALONE g_application_set_inactivity_timeout (app, 10000); diff --git a/gio/tests/gapplication-example-open.c b/gio/tests/gapplication-example-open.c index 6dcf53c22..0fc17bb20 100644 --- a/gio/tests/gapplication-example-open.c +++ b/gio/tests/gapplication-example-open.c @@ -15,10 +15,10 @@ activate (GApplication *application) } static void -open (GApplication *application, - GFile **files, - gint n_files, - const gchar *hint) +app_open (GApplication *application, + GFile **files, + gint n_files, + const gchar *hint) { gint i; @@ -45,7 +45,7 @@ main (int argc, char **argv) app = g_application_new ("org.gtk.TestApplication", G_APPLICATION_HANDLES_OPEN); g_signal_connect (app, "activate", G_CALLBACK (activate), NULL); - g_signal_connect (app, "open", G_CALLBACK (open), NULL); + g_signal_connect (app, "open", G_CALLBACK (app_open), NULL); g_application_set_inactivity_timeout (app, 10000); status = g_application_run (app, argc, argv); diff --git a/gio/tests/gtlsconsoleinteraction.c b/gio/tests/gtlsconsoleinteraction.c index 8416574be..a0fee3d43 100644 --- a/gio/tests/gtlsconsoleinteraction.c +++ b/gio/tests/gtlsconsoleinteraction.c @@ -47,7 +47,7 @@ G_DEFINE_TYPE (GTlsConsoleInteraction, g_tls_console_interaction, G_TYPE_TLS_INT #define BUFSIZ 8192 #endif static gchar * -getpass (const gchar *prompt) +static_getpass (const gchar *prompt) { static gchar buf[BUFSIZ]; gint i; @@ -71,6 +71,9 @@ getpass (const gchar *prompt) return &buf[0]; } +#undef getpass +#define getpass static_getpass /* avoid overloading a potential + build environment defintion of getpass */ #endif static GTlsInteractionResult