Make things inherit from GInitiallyUnowned, some more socket changes

[cascardo/gnio.git] / test / test-stuff.c

diff --git a/test/test-stuff.c b/test/test-stuff.c
index 9ccfc3c..4209e86 100644 (file)
--- a/test/test-stuff.c
+++ b/test/test-stuff.c
@@ -5,7 +5,9 @@
 #include <glib.h>
 #include <glib/gprintf.h>
 
-#include <winsock2.h>
+#ifdef G_OS_WIN32
+# include <winsock2.h>
+#endif
 
 GMainLoop *loop;
 
@@ -14,7 +16,7 @@ void print_address (GInetAddress *address, gpointer data);
 void
 print_address (GInetAddress *address, gpointer data)
 {
-       gchar *string = g_inet4_address_to_string (G_INET4_ADDRESS (address));
+       gchar *string = g_inet_address_to_string (G_INET_ADDRESS (address));
 
        g_printf ("%s\n", string);
 
@@ -53,20 +55,26 @@ int main (int argc, char *argv[])
        GInetAddress *address;
        GResolver *resolver;
        GError *error = NULL;
+#ifdef G_OS_WIN32
        WSADATA wsaData;
+#endif
 
        g_thread_init (NULL);
 
        g_type_init ();
 
+#ifdef G_OS_WIN32
        if (WSAStartup (MAKEWORD (2, 2), &wsaData) != 0)
                return 0;
+#endif
 
        loop = g_main_loop_new (NULL, FALSE);
 
        address = (GInetAddress *) g_inet4_address_from_string ("127.0.0.1");
 
-       g_printf ("%s:\n", g_inet4_address_to_string (G_INET4_ADDRESS (address)));
+       g_printf ("is floating: %d\n", g_object_is_floating (address));
+
+       g_printf ("%s:\n", g_inet_address_to_string (address));
 
        g_printf ("is_any: %d, is_linklocal: %d, is_loopback: %d\n", g_inet_address_is_any (address), g_inet_address_is_linklocal (address), g_inet_address_is_loopback (address));
 
@@ -74,7 +82,7 @@ int main (int argc, char *argv[])
 
        address = (GInetAddress *) g_inet4_address_from_string ("0.0.0.0");
 
-       g_printf ("\n%s:\n", g_inet4_address_to_string (G_INET4_ADDRESS (address)));
+       g_printf ("\n%s:\n", g_inet_address_to_string (address));
 
        g_printf ("is_any: %d, is_linklocal: %d, is_loopback: %d\n", g_inet_address_is_any (address), g_inet_address_is_linklocal (address), g_inet_address_is_loopback (address));
 
@@ -82,7 +90,7 @@ int main (int argc, char *argv[])
 
        address = (GInetAddress *) g_inet4_address_from_string ("169.254.0.0");
 
-       g_printf ("\n%s:\n", g_inet4_address_to_string (G_INET4_ADDRESS (address)));
+       g_printf ("\n%s:\n", g_inet_address_to_string (address));
 
        g_printf ("is_any: %d, is_linklocal: %d, is_loopback: %d\n", g_inet_address_is_any (address), g_inet_address_is_linklocal (address), g_inet_address_is_loopback (address));
 
@@ -97,7 +105,7 @@ int main (int argc, char *argv[])
                return 0;
        }
 
-       g_printf ("\nwww.yahoo.com: %s\n", g_inet4_address_to_string (G_INET4_ADDRESS (address)));
+       g_printf ("\nwww.yahoo.com: %s\n", g_inet_address_to_string (address));
 
        g_printf ("is_any: %d, is_linklocal: %d, is_loopback: %d\n", g_inet_address_is_any (address), g_inet_address_is_linklocal (address), g_inet_address_is_loopback (address));