diff options
| author | Marcel Holtmann <marcel@holtmann.org> | 2007-01-20 05:26:15 +0000 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2007-01-20 05:26:15 +0000 |
| commit | 8cc5595d9091b484b9a4abe314c0f3ec055e0581 (patch) | |
| tree | 0d20c6f621673dbdb6095fb4854077152c1d9b40 /test/hciemu.c | |
| parent | 884cfe825db1a0e8c98aa6a604fd4588a1de1340 (diff) | |
Make it possible to support an embedded GLib
Diffstat (limited to 'test/hciemu.c')
| -rw-r--r-- | test/hciemu.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/hciemu.c b/test/hciemu.c index a974a0c1..79f642a4 100644 --- a/test/hciemu.c +++ b/test/hciemu.c @@ -50,7 +50,7 @@ #include <netdb.h> -#include "glib-ectomy.h" +#include <glib.h> #if __BYTE_ORDER == __LITTLE_ENDIAN static inline uint64_t ntoh64(uint64_t n) @@ -144,7 +144,7 @@ static inline void io_cancel(void) static void sig_term(int sig) { io_cancel(); - g_main_quit(event_loop); + g_main_loop_quit(event_loop); } static gboolean io_acl_data(GIOChannel *chan, GIOCondition cond, gpointer data); @@ -979,7 +979,7 @@ static gboolean io_hci_data(GIOChannel *chan, GIOCondition cond, gpointer data) syslog(LOG_ERR, "Read failed: %s (%d)", strerror(errno), errno); g_io_channel_unref(chan); - g_main_quit(event_loop); + g_main_loop_quit(event_loop); return FALSE; } @@ -1298,7 +1298,7 @@ int main(int argc, char *argv[]) dd = -1; /* Create event loop */ - event_loop = g_main_new(FALSE); + event_loop = g_main_loop_new(NULL, FALSE); if (dev >= 0) return run_proxy(fd, dev, &bdaddr); @@ -1333,7 +1333,7 @@ int main(int argc, char *argv[]) setpriority(PRIO_PROCESS, 0, -19); /* Start event processor */ - g_main_run(event_loop); + g_main_loop_run(event_loop); close(fd); |