Mercurial > mplayer.hg

comparison stream/librtsp/rtsp.c @ 27320:44341e4d5621

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Do not include sys/socket.h when using winsock2, it is pointless and breaks compilation under MinGW.
author reimar
date Sat, 26 Jul 2008 20:58:50 +0000
parents 747d3f6fbe81
children 5a30f5bc23a0
comparison
equal deleted inserted replaced
27319:09cf111f68b8 27320:44341e4d5621
39 #include <errno.h> 39 #include <errno.h>
40 #include <stdlib.h> 40 #include <stdlib.h>
41 #include <time.h> 41 #include <time.h>
42 #include <sys/time.h> 42 #include <sys/time.h>
43 #include <sys/types.h> 43 #include <sys/types.h>
44 #include <sys/socket.h>
45 #include <inttypes.h> 44 #include <inttypes.h>
46 #ifdef HAVE_WINSOCK2 45 #ifdef HAVE_WINSOCK2
47 #include <winsock2.h> 46 #include <winsock2.h>
47 #else
48 #include <sys/socket.h>
48 #endif 49 #endif
49 #include "mp_msg.h" 50 #include "mp_msg.h"
50 #include "rtsp.h" 51 #include "rtsp.h"
51 #include "rtsp_session.h" 52 #include "rtsp_session.h"
52 #include "osdep/timer.h" 53 #include "osdep/timer.h"