Mercurial > mplayer.hg

changeset 31429:b542cd25f03d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move network_prefer_ipv4/reuse_socket extern declarations to tcp.h/udp.h.
author diego
date Sun, 20 Jun 2010 17:58:37 +0000
parents 68c60d07cdbc
children a2c6762a9adc
files cfg-common.h stream/tcp.h stream/udp.h
diffstat 3 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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[];
--- 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);
 
--- 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 */