[MPlayer-cvslog] r31495 - in trunk: cfg-common.h stream/tcp.h stream/udp.h

[diego]

Author: diego
Date: Sun Jun 20 19:58:37 2010
New Revision: 31495

Log:
Move network_prefer_ipv4/reuse_socket extern declarations to tcp.h/udp.h.

Modified:
   trunk/cfg-common.h
   trunk/stream/tcp.h
   trunk/stream/udp.h

Modified: trunk/cfg-common.h
==============================================================================
--- trunk/cfg-common.h	Sun Jun 20 19:54:46 2010	(r31494)
+++ trunk/cfg-common.h	Sun Jun 20 19:58:37 2010	(r31495)
@@ -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[];

Modified: trunk/stream/tcp.h
==============================================================================
--- trunk/stream/tcp.h	Sun Jun 20 19:54:46 2010	(r31494)
+++ trunk/stream/tcp.h	Sun Jun 20 19:58:37 2010	(r31495)
@@ -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);
 

Modified: trunk/stream/udp.h
==============================================================================
--- trunk/stream/udp.h	Sun Jun 20 19:54:46 2010	(r31494)
+++ trunk/stream/udp.h	Sun Jun 20 19:58:37 2010	(r31495)
@@ -25,6 +25,8 @@
 
 #include "url.h"
 
+extern int reuse_socket;
+
 int udp_open_socket (URL_t *url);
 
 #endif /* MPLAYER_UDP_H */