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

gio/tests: avoid shadowing of libc names under bionic libc

Browse Source 
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
This commit is contained in:
Øyvind Kolås
2023-05-20 12:39:46 +02:00
parent 3050c16aea
commit 786f379d78
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gio/tests/basic-application.c
View File

@@ -74,10 +74,10 @@ activate (GApplication *application)
} }
static void static void
open (GApplication *application, app_open (GApplication *application,
GFile **files, GFile **files,
gint n_files, gint n_files,
const gchar *hint) const gchar *hint)
{ {
gint i; gint i;
@@ -249,7 +249,7 @@ main (int argc, char **argv)
: G_APPLICATION_HANDLES_OPEN)); : G_APPLICATION_HANDLES_OPEN));
g_signal_connect (app, "startup", G_CALLBACK (startup), NULL); g_signal_connect (app, "startup", G_CALLBACK (startup), NULL);
g_signal_connect (app, "activate", G_CALLBACK (activate), 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); g_signal_connect (app, "command-line", G_CALLBACK (command_line), NULL);
#ifdef STANDALONE #ifdef STANDALONE
g_application_set_inactivity_timeout (app, 10000); g_application_set_inactivity_timeout (app, 10000);

10
gio/tests/gapplication-example-open.c
View File

@@ -15,10 +15,10 @@ activate (GApplication *application)
} }
static void static void
open (GApplication *application, app_open (GApplication *application,
GFile **files, GFile **files,
gint n_files, gint n_files,
const gchar *hint) const gchar *hint)
{ {
gint i; gint i;
@@ -45,7 +45,7 @@ main (int argc, char **argv)
app = g_application_new ("org.gtk.TestApplication", app = g_application_new ("org.gtk.TestApplication",
G_APPLICATION_HANDLES_OPEN); G_APPLICATION_HANDLES_OPEN);
g_signal_connect (app, "activate", G_CALLBACK (activate), 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_application_set_inactivity_timeout (app, 10000); g_application_set_inactivity_timeout (app, 10000);
status = g_application_run (app, argc, argv); status = g_application_run (app, argc, argv);

5
gio/tests/gtlsconsoleinteraction.c
View File

@@ -47,7 +47,7 @@ G_DEFINE_TYPE (GTlsConsoleInteraction, g_tls_console_interaction, G_TYPE_TLS_INT
#define BUFSIZ 8192 #define BUFSIZ 8192
#endif #endif
static gchar * static gchar *
getpass (const gchar *prompt) static_getpass (const gchar *prompt)
{ {
static gchar buf[BUFSIZ]; static gchar buf[BUFSIZ];
gint i; gint i;
@@ -71,6 +71,9 @@ getpass (const gchar *prompt)
return &buf[0]; return &buf[0];
} }
#undef getpass
#define getpass static_getpass /* avoid overloading a potential
build environment defintion of getpass */
#endif #endif
static GTlsInteractionResult static GTlsInteractionResult