diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | src/ClientNew.cxx (renamed from src/client_new.c) | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index fa4433eb..8fafcb7d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -256,7 +256,7 @@ src_mpd_SOURCES = \ src/client_idle.h \ src/client_idle.c \ src/client_list.c \ - src/client_new.c \ + src/ClientNew.cxx \ src/client_process.c \ src/client_read.c \ src/client_write.c \ diff --git a/src/client_new.c b/src/ClientNew.cxx index cf28c43c..28a837b6 100644 --- a/src/client_new.c +++ b/src/ClientNew.cxx @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2011 The Music Player Daemon Project + * Copyright (C) 2003-2013 The Music Player Daemon Project * http://www.musicpd.org * * This program is free software; you can redistribute it and/or modify @@ -18,11 +18,15 @@ */ #include "config.h" +extern "C" { #include "client_internal.h" +} #include "fd_util.h" +extern "C" { #include "fifo_buffer.h" #include "resolver.h" #include "permission.h" +} #include "glib_socket.h" #include <assert.h> @@ -99,7 +103,7 @@ client_new(struct player_control *player_control, g_io_channel_set_buffered(client->channel, false); client->source_id = g_io_add_watch(client->channel, - G_IO_IN|G_IO_ERR|G_IO_HUP, + GIOCondition(G_IO_IN|G_IO_ERR|G_IO_HUP), client_in_event, client); client->input = fifo_buffer_new(4096); @@ -136,7 +140,7 @@ client_new(struct player_control *player_control, static void deferred_buffer_free(gpointer data, G_GNUC_UNUSED gpointer user_data) { - struct deferred_buffer *buffer = data; + struct deferred_buffer *buffer = (struct deferred_buffer *)data; g_free(buffer); } |