_frida: Support UNIX socket addresses everywhere

oleavr · oleavr · commit 1ef5f900c4b5 · 2022-11-07T23:17:31.000+01:00
Now that latest GLib supports it.
diff --git a/src/_frida.c b/src/_frida.c
@@ -6,9 +6,6 @@
 
 #include <frida-core.h>
 #include <string.h>
-#if defined (G_OS_UNIX) && !defined (G_TYPE_UNIX_SOCKET_ADDRESS)
-# include <gio/gunixsocketaddress.h>
-#endif
 
 #ifdef _MSC_VER
 # pragma warning (push)
@@ -1788,7 +1785,6 @@ PyGObject_marshal_socket_address (GSocketAddress * address)
 
     g_free (host);
   }
-#ifdef G_OS_UNIX
   else if (G_IS_UNIX_SOCKET_ADDRESS (address))
   {
     GUnixSocketAddress * sa = G_UNIX_SOCKET_ADDRESS (address);
@@ -1821,7 +1817,6 @@ PyGObject_marshal_socket_address (GSocketAddress * address)
       }
     }
   }
-#endif
 
   if (result == NULL)
     result = PyGObject_new_take_handle (g_object_ref (address), PYFRIDA_TYPE (GObject));

Original file line number	Diff line number	Diff line change
`@@ -6,9 +6,6 @@`
`6`	`6`
`7`	`7`	`#include <frida-core.h>`
`8`	`8`	`#include <string.h>`
`9`		`-#if defined (G_OS_UNIX) && !defined (G_TYPE_UNIX_SOCKET_ADDRESS)`
`10`		`-# include <gio/gunixsocketaddress.h>`
`11`		`-#endif`
`12`	`9`
`13`	`10`	`#ifdef _MSC_VER`
`14`	`11`	`# pragma warning (push)`
`@@ -1788,7 +1785,6 @@ PyGObject_marshal_socket_address (GSocketAddress * address)`
`1788`	`1785`
`1789`	`1786`	`g_free (host);`
`1790`	`1787`	`}`
`1791`		`-#ifdef G_OS_UNIX`
`1792`	`1788`	`else if (G_IS_UNIX_SOCKET_ADDRESS (address))`
`1793`	`1789`	`{`
`1794`	`1790`	`GUnixSocketAddress * sa = G_UNIX_SOCKET_ADDRESS (address);`
`@@ -1821,7 +1817,6 @@ PyGObject_marshal_socket_address (GSocketAddress * address)`
`1821`	`1817`	`}`
`1822`	`1818`	`}`
`1823`	`1819`	`}`
`1824`		`-#endif`
`1825`	`1820`
`1826`	`1821`	`if (result == NULL)`
`1827`	`1822`	`result = PyGObject_new_take_handle (g_object_ref (address), PYFRIDA_TYPE (GObject));`