# HG changeset patch # User diego # Date 1277056717 0 # Node ID b542cd25f03d3e986ae824b519eb37e67e5638e4 # Parent 68c60d07cdbcfbb86bd1c8baac95109f2a916aee Move network_prefer_ipv4/reuse_socket extern declarations to tcp.h/udp.h. diff -r 68c60d07cdbc -r b542cd25f03d cfg-common.h --- a/cfg-common.h Sun Jun 20 17:54:46 2010 +0000 +++ b/cfg-common.h Sun Jun 20 17:58:37 2010 +0000 @@ -41,15 +41,14 @@ #include "stream/network.h" #include "stream/pvr.h" #include "stream/stream_dvd_common.h" +#include "stream/tcp.h" +#include "stream/udp.h" #include "codec-cfg.h" #ifdef CONFIG_CDDA #include "stream/cdd.h" #endif -extern int network_prefer_ipv4; -extern int reuse_socket; - /* defined in libmpdemux: */ extern const m_option_t demux_rawaudio_opts[]; extern const m_option_t demux_rawvideo_opts[]; diff -r 68c60d07cdbc -r b542cd25f03d stream/tcp.h --- a/stream/tcp.h Sun Jun 20 17:54:46 2010 +0000 +++ b/stream/tcp.h Sun Jun 20 17:58:37 2010 +0000 @@ -25,6 +25,8 @@ #ifndef MPLAYER_TCP_H #define MPLAYER_TCP_H +extern int network_prefer_ipv4; + /* Connect to a server using a TCP connection */ int connect2Server (char *host, int port, int verb); diff -r 68c60d07cdbc -r b542cd25f03d stream/udp.h --- a/stream/udp.h Sun Jun 20 17:54:46 2010 +0000 +++ b/stream/udp.h Sun Jun 20 17:58:37 2010 +0000 @@ -25,6 +25,8 @@ #include "url.h" +extern int reuse_socket; + int udp_open_socket (URL_t *url); #endif /* MPLAYER_UDP_H */