From 5822daa63de641419dcecd19e81f1c4190bd1cce Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 15 Jan 2013 18:58:02 +0100 Subject: output_internal, ...: add extern "C" --- src/encoder_list.h | 8 ++++++++ src/icy_server.h | 8 ++++++++ src/output_internal.h | 8 ++++++++ src/page.h | 8 ++++++++ src/resolver.h | 8 ++++++++ src/server_socket.h | 8 ++++++++ src/timer.h | 8 ++++++++ 7 files changed, 56 insertions(+) (limited to 'src') diff --git a/src/encoder_list.h b/src/encoder_list.h index fb1c9bf9c..31663c751 100644 --- a/src/encoder_list.h +++ b/src/encoder_list.h @@ -30,6 +30,10 @@ extern const struct encoder_plugin *const encoder_plugins[]; (plugin = *encoder_plugin_iterator) != NULL; \ ++encoder_plugin_iterator) +#ifdef __cplusplus +extern "C" { +#endif + /** * Looks up an encoder plugin by its name. * @@ -40,4 +44,8 @@ extern const struct encoder_plugin *const encoder_plugins[]; const struct encoder_plugin * encoder_plugin_get(const char *name); +#ifdef __cplusplus +} +#endif + #endif diff --git a/src/icy_server.h b/src/icy_server.h index 04f21d2ad..17fb391ba 100644 --- a/src/icy_server.h +++ b/src/icy_server.h @@ -25,6 +25,10 @@ #include +#ifdef __cplusplus +extern "C" { +#endif + char* icy_server_metadata_header(const char *name, const char *genre, const char *url, @@ -33,4 +37,8 @@ icy_server_metadata_header(const char *name, struct page* icy_server_metadata_page(const struct tag *tag, ...); +#ifdef __cplusplus +} +#endif + #endif diff --git a/src/output_internal.h b/src/output_internal.h index 1a3e8aa1f..692233f3c 100644 --- a/src/output_internal.h +++ b/src/output_internal.h @@ -257,6 +257,10 @@ audio_output_command_is_finished(const struct audio_output *ao) return ao->command == AO_COMMAND_NONE; } +#ifdef __cplusplus +extern "C" { +#endif + struct audio_output * audio_output_new(const struct config_param *param, struct player_control *pc, @@ -273,4 +277,8 @@ ao_base_finish(struct audio_output *ao); void audio_output_free(struct audio_output *ao); +#ifdef __cplusplus +} +#endif + #endif diff --git a/src/page.h b/src/page.h index 8a3aaf396..8629298cd 100644 --- a/src/page.h +++ b/src/page.h @@ -53,6 +53,10 @@ struct page { unsigned char data[sizeof(long)]; }; +#ifdef __cplusplus +extern "C" { +#endif + /** * Creates a new #page object, and copies data from the specified * buffer. It is initialized with a reference count of 1. @@ -91,4 +95,8 @@ page_ref(struct page *page); bool page_unref(struct page *page); +#ifdef __cplusplus +} +#endif + #endif diff --git a/src/resolver.h b/src/resolver.h index 666b6d5b2..af14f5f23 100644 --- a/src/resolver.h +++ b/src/resolver.h @@ -34,6 +34,10 @@ resolver_quark(void) return g_quark_from_static_string("resolver"); } +#ifdef __cplusplus +extern "C" { +#endif + /** * Converts the specified socket address into a string in the form * "IP:PORT". The return value must be freed with g_free() when you @@ -63,4 +67,8 @@ resolve_host_port(const char *host_port, unsigned default_port, int flags, int socktype, GError **error_r); +#ifdef __cplusplus +} +#endif + #endif diff --git a/src/server_socket.h b/src/server_socket.h index f7e9aa4cf..5dc684013 100644 --- a/src/server_socket.h +++ b/src/server_socket.h @@ -32,6 +32,10 @@ typedef void (*server_socket_callback_t)(int fd, size_t address_length, int uid, void *ctx); +#ifdef __cplusplus +extern "C" { +#endif + struct server_socket * server_socket_new(server_socket_callback_t callback, void *callback_ctx); @@ -90,4 +94,8 @@ bool server_socket_add_path(struct server_socket *ss, const char *path, GError **error_r); +#ifdef __cplusplus +} +#endif + #endif diff --git a/src/timer.h b/src/timer.h index 184881249..1506c9173 100644 --- a/src/timer.h +++ b/src/timer.h @@ -30,6 +30,10 @@ struct timer { int rate; }; +#ifdef __cplusplus +extern "C" { +#endif + struct timer *timer_new(const struct audio_format *af); void timer_free(struct timer *timer); @@ -48,4 +52,8 @@ timer_delay(const struct timer *timer); void timer_sync(struct timer *timer); +#ifdef __cplusplus +} +#endif + #endif -- cgit v1.2.3