Mercurial > mplayer.hg

changeset 18835:65e867664a43

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
avoid messing up with includes
author ben
date Tue, 27 Jun 2006 19:16:43 +0000
parents 306982c83e8e
children 10d3a190d935
files libmpdemux/librtsp/rtsp_rtp.c libmpdemux/librtsp/rtsp_rtp.h
diffstat 2 files changed, 2 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/librtsp/rtsp_rtp.c	Tue Jun 27 05:58:46 2006 +0000
+++ b/libmpdemux/librtsp/rtsp_rtp.c	Tue Jun 27 19:16:43 2006 +0000
@@ -18,8 +18,6 @@
  *  Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <pthread.h>
-#include <netdb.h>
 #include <unistd.h>
 #include <stdio.h>
 #include <string.h>
@@ -28,15 +26,16 @@
 #include <sys/types.h>
 
 #ifndef HAVE_WINSOCK2
+#include <netdb.h>
 #include <netinet/in.h>
 #include <sys/socket.h>
 #include <arpa/inet.h>
-#define closesocket close
 #else
 #include <winsock2.h>
 #include <ws2tcpip.h>
 #endif
 
+#include "config.h"
 #include "mp_msg.h"
 #include "rtsp.h"
 #include "rtsp_rtp.h"
--- a/libmpdemux/librtsp/rtsp_rtp.h	Tue Jun 27 05:58:46 2006 +0000
+++ b/libmpdemux/librtsp/rtsp_rtp.h	Tue Jun 27 19:16:43 2006 +0000
@@ -21,8 +21,6 @@
 #ifndef _HAVE_RTSP_RTP_H_
 #define _HAVE_RTSP_RTP_H_
 
-#include <pthread.h>
-
 #include "rtsp.h"
 
 #define MAX_PREVIEW_SIZE 4096