luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-26 05:56:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ok/termux-build-issues' into 'main'

Browse Source 
gio, tests: adaptations for building with bionic libc from termux

Closes #3008

See merge request GNOME/glib!3443
This commit is contained in:
Philip Withnall 2023-05-30 13:04:17 +00:00
commit 1aefcf4e0e
5 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gio/gunixmounts.c
View File

@ -46,6 +46,15 @@
#include <gstdio.h> #include <gstdio.h>
#include <dirent.h> #include <dirent.h>
#if defined(__BIONIC__) && (__ANDROID_API__ < 26)
#include <mntent.h>
/* the shared object of recent bionic libc's have hasmntopt symbol, but
some a possible common build environment for android, termux ends
up with inssuficient __ANDROID_API__ value for building.
*/
extern char* hasmntopt(const struct mntent* mnt, const char* opt);
#endif
#if HAVE_SYS_STATFS_H #if HAVE_SYS_STATFS_H
#include <sys/statfs.h> #include <sys/statfs.h>
#endif #endif

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

2
glib/tests/getpwuid-preload.c
View File

@ -25,6 +25,8 @@
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>
#undef getpwuid
static struct passwd my_pw; static struct passwd my_pw;
/* This is used in gutils.c used to make sure utility functions /* This is used in gutils.c used to make sure utility functions