[MPlayer-cvslog] r18839 - in trunk/libmpdemux/librtsp: rtsp_rtp.c rtsp_rtp.h

ben subversion at mplayerhq.hu
Tue Jun 27 21:16:44 CEST 2006


Author: ben
Date: Tue Jun 27 21:16:43 2006
New Revision: 18839

Modified:
   trunk/libmpdemux/librtsp/rtsp_rtp.c
   trunk/libmpdemux/librtsp/rtsp_rtp.h

Log:
avoid messing up with includes

Modified: trunk/libmpdemux/librtsp/rtsp_rtp.c
==============================================================================
--- trunk/libmpdemux/librtsp/rtsp_rtp.c	(original)
+++ trunk/libmpdemux/librtsp/rtsp_rtp.c	Tue Jun 27 21:16:43 2006
@@ -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"

Modified: trunk/libmpdemux/librtsp/rtsp_rtp.h
==============================================================================
--- trunk/libmpdemux/librtsp/rtsp_rtp.h	(original)
+++ trunk/libmpdemux/librtsp/rtsp_rtp.h	Tue Jun 27 21:16:43 2006
@@ -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



More information about the MPlayer-cvslog mailing list