59 lines
1.2 KiB
Diff
59 lines
1.2 KiB
Diff
--- a/gio/gsocket.c
|
|
+++ b/gio/gsocket.c
|
|
@@ -461,7 +461,12 @@ g_socket_details_from_fd (GSocket *socke
|
|
struct sockaddr sa;
|
|
} address;
|
|
gint fd;
|
|
- guint addrlen;
|
|
+#if defined __ANDROID__ && !defined __LP64__
|
|
+ gint
|
|
+#else
|
|
+ guint
|
|
+#endif
|
|
+ addrlen;
|
|
int value, family;
|
|
int errsv;
|
|
|
|
@@ -1990,7 +1995,12 @@ g_socket_get_local_address (GSocket *so
|
|
struct sockaddr_storage storage;
|
|
struct sockaddr sa;
|
|
} buffer;
|
|
- guint len = sizeof (buffer);
|
|
+#if defined __ANDROID__ && !defined __LP64__
|
|
+ gint
|
|
+#else
|
|
+ guint
|
|
+#endif
|
|
+ len = sizeof (buffer);
|
|
|
|
g_return_val_if_fail (G_IS_SOCKET (socket), NULL);
|
|
|
|
@@ -2026,7 +2036,12 @@ g_socket_get_remote_address (GSocket *s
|
|
struct sockaddr_storage storage;
|
|
struct sockaddr sa;
|
|
} buffer;
|
|
- guint len = sizeof (buffer);
|
|
+#if defined __ANDROID__ && !defined __LP64__
|
|
+ gint
|
|
+#else
|
|
+ guint
|
|
+#endif
|
|
+ len = sizeof (buffer);
|
|
|
|
g_return_val_if_fail (G_IS_SOCKET (socket), NULL);
|
|
|
|
@@ -6220,7 +6235,12 @@ g_socket_get_option (GSocket *socket,
|
|
gint *value,
|
|
GError **error)
|
|
{
|
|
- guint size;
|
|
+#if defined __ANDROID__ && !defined __LP64__
|
|
+ gint
|
|
+#else
|
|
+ guint
|
|
+#endif
|
|
+ size;
|
|
|
|
g_return_val_if_fail (G_IS_SOCKET (socket), FALSE);
|
|
|