Commit 9c1b7ed4 authored by Olivier Crête's avatar Olivier Crête

examples: Make them build and work on Windows

parent 3df534a7
...@@ -41,10 +41,11 @@ ...@@ -41,10 +41,11 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>
#include <unistd.h>
#include <agent.h> #include <agent.h>
#include <gio/gnetworking.h>
static GMainLoop *gloop; static GMainLoop *gloop;
static gchar *stun_addr = NULL; static gchar *stun_addr = NULL;
static guint stun_port; static guint stun_port;
...@@ -95,6 +96,7 @@ main(int argc, char *argv[]) ...@@ -95,6 +96,7 @@ main(int argc, char *argv[])
#if !GLIB_CHECK_VERSION(2, 36, 0) #if !GLIB_CHECK_VERSION(2, 36, 0)
g_type_init(); g_type_init();
#endif #endif
g_networking_init();
gloop = g_main_loop_new(NULL, FALSE); gloop = g_main_loop_new(NULL, FALSE);
...@@ -119,8 +121,12 @@ example_thread(void *data) ...@@ -119,8 +121,12 @@ example_thread(void *data)
gchar *line = NULL; gchar *line = NULL;
gchar *sdp, *sdp64; gchar *sdp, *sdp64;
#ifdef G_OS_WIN32
io_stdin = g_io_channel_win32_new(_fileno(stdin));
#else
io_stdin = g_io_channel_unix_new(fileno(stdin)); io_stdin = g_io_channel_unix_new(fileno(stdin));
g_io_channel_set_flags (io_stdin, G_IO_FLAG_NONBLOCK, NULL); #endif
g_io_channel_set_flags(io_stdin, G_IO_FLAG_NONBLOCK, NULL);
// Create the nice agent // Create the nice agent
agent = nice_agent_new(g_main_loop_get_context (gloop), agent = nice_agent_new(g_main_loop_get_context (gloop),
...@@ -198,7 +204,7 @@ example_thread(void *data) ...@@ -198,7 +204,7 @@ example_thread(void *data)
g_free (sdp); g_free (sdp);
g_free (line); g_free (line);
} else if (s == G_IO_STATUS_AGAIN) { } else if (s == G_IO_STATUS_AGAIN) {
usleep (100000); g_usleep (100000);
} }
} }
...@@ -223,7 +229,7 @@ example_thread(void *data) ...@@ -223,7 +229,7 @@ example_thread(void *data)
printf("> "); printf("> ");
fflush (stdout); fflush (stdout);
} else if (s == G_IO_STATUS_AGAIN) { } else if (s == G_IO_STATUS_AGAIN) {
usleep (100000); g_usleep (100000);
} else { } else {
// Ctrl-D was pressed. // Ctrl-D was pressed.
nice_agent_send(agent, stream_id, 1, 1, "\0"); nice_agent_send(agent, stream_id, 1, 1, "\0");
......
...@@ -42,8 +42,11 @@ ...@@ -42,8 +42,11 @@
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>
#include <gio/gnetworking.h>
#include <agent.h> #include <agent.h>
static GMainLoop *gloop; static GMainLoop *gloop;
static GIOChannel* io_stdin; static GIOChannel* io_stdin;
static guint stream_id; static guint stream_id;
...@@ -104,9 +107,14 @@ main(int argc, char *argv[]) ...@@ -104,9 +107,14 @@ main(int argc, char *argv[])
#if !GLIB_CHECK_VERSION(2, 36, 0) #if !GLIB_CHECK_VERSION(2, 36, 0)
g_type_init(); g_type_init();
#endif #endif
g_networking_init();
gloop = g_main_loop_new(NULL, FALSE); gloop = g_main_loop_new(NULL, FALSE);
#ifdef G_OS_WIN32
io_stdin = g_io_channel_win32_new(_fileno(stdin));
#else
io_stdin = g_io_channel_unix_new(fileno(stdin)); io_stdin = g_io_channel_unix_new(fileno(stdin));
#endif
// Create the nice agent // Create the nice agent
agent = nice_agent_new(g_main_loop_get_context (gloop), agent = nice_agent_new(g_main_loop_get_context (gloop),
......
...@@ -41,10 +41,11 @@ ...@@ -41,10 +41,11 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <ctype.h> #include <ctype.h>
#include <unistd.h>
#include <agent.h> #include <agent.h>
#include <gio/gnetworking.h>
static GMainLoop *gloop; static GMainLoop *gloop;
static gchar *stun_addr = NULL; static gchar *stun_addr = NULL;
static guint stun_port; static guint stun_port;
...@@ -104,6 +105,7 @@ main(int argc, char *argv[]) ...@@ -104,6 +105,7 @@ main(int argc, char *argv[])
#if !GLIB_CHECK_VERSION(2, 36, 0) #if !GLIB_CHECK_VERSION(2, 36, 0)
g_type_init(); g_type_init();
#endif #endif
g_networking_init();
gloop = g_main_loop_new(NULL, FALSE); gloop = g_main_loop_new(NULL, FALSE);
...@@ -129,7 +131,11 @@ example_thread(void *data) ...@@ -129,7 +131,11 @@ example_thread(void *data)
gchar *line = NULL; gchar *line = NULL;
int rval; int rval;
#ifdef G_OS_WIN32
io_stdin = g_io_channel_win32_new(_fileno(stdin));
#else
io_stdin = g_io_channel_unix_new(fileno(stdin)); io_stdin = g_io_channel_unix_new(fileno(stdin));
#endif
g_io_channel_set_flags (io_stdin, G_IO_FLAG_NONBLOCK, NULL); g_io_channel_set_flags (io_stdin, G_IO_FLAG_NONBLOCK, NULL);
// Create the nice agent // Create the nice agent
...@@ -202,7 +208,7 @@ example_thread(void *data) ...@@ -202,7 +208,7 @@ example_thread(void *data)
} }
g_free (line); g_free (line);
} else if (s == G_IO_STATUS_AGAIN) { } else if (s == G_IO_STATUS_AGAIN) {
usleep (100000); g_usleep (100000);
} }
} }
...@@ -238,7 +244,7 @@ example_thread(void *data) ...@@ -238,7 +244,7 @@ example_thread(void *data)
printf("> "); printf("> ");
fflush (stdout); fflush (stdout);
} else if (s == G_IO_STATUS_AGAIN) { } else if (s == G_IO_STATUS_AGAIN) {
usleep (100000); g_usleep (100000);
} else { } else {
// Ctrl-D was pressed. // Ctrl-D was pressed.
nice_agent_send(agent, stream_id, 1, 1, "\0"); nice_agent_send(agent, stream_id, 1, 1, "\0");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment