diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-09-03 10:16:30 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2008-09-03 10:16:30 +0300 |
commit | b56858342fdbe48489618107df75e5bd0451eb0b (patch) | |
tree | 5d41ef858502bae99dcbebdd728d42a6040adb03 /stream/librtsp/rtsp_rtp.c | |
parent | 8ea7eb77fc7ba8bd0b596ea32ee60909a012828f (diff) | |
parent | bae94777d7ddaa2d4763507fdb93b9520327c9d1 (diff) | |
download | mpv-b56858342fdbe48489618107df75e5bd0451eb0b.tar.bz2 mpv-b56858342fdbe48489618107df75e5bd0451eb0b.tar.xz |
Merge svn changes up to r27514
Diffstat (limited to 'stream/librtsp/rtsp_rtp.c')
-rw-r--r-- | stream/librtsp/rtsp_rtp.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/stream/librtsp/rtsp_rtp.c b/stream/librtsp/rtsp_rtp.c index b582b1a700..fd01524d89 100644 --- a/stream/librtsp/rtsp_rtp.c +++ b/stream/librtsp/rtsp_rtp.c @@ -28,7 +28,7 @@ #include "config.h" -#ifndef HAVE_WINSOCK2 +#ifndef HAVE_WINSOCK2_H #include <netdb.h> #include <netinet/in.h> #include <sys/socket.h> @@ -42,8 +42,8 @@ #include "rtsp.h" #include "rtsp_rtp.h" #include "rtsp_session.h" -#include "../freesdp/common.h" -#include "../freesdp/parser.h" +#include "stream/freesdp/common.h" +#include "stream/freesdp/parser.h" #define RTSP_DEFAULT_PORT 31336 #define MAX_LENGTH 256 @@ -250,7 +250,7 @@ rtcp_connect (int client_port, int server_port, const char* server_hostname) if (bind (s, (struct sockaddr *) &sin, sizeof (sin))) { -#ifndef HAVE_WINSOCK2 +#ifndef HAVE_WINSOCK2_H if (errno != EINPROGRESS) #else if (WSAGetLastError() != WSAEINPROGRESS) @@ -296,7 +296,7 @@ rtp_connect (char *hostname, int port) if (!hostname || !strcmp (hostname, "0.0.0.0")) sin.sin_addr.s_addr = htonl (INADDR_ANY); else -#ifndef HAVE_WINSOCK2 +#ifndef HAVE_WINSOCK2_H #ifdef HAVE_ATON inet_aton (hostname, &sin.sin_addr); #else @@ -331,7 +331,7 @@ rtp_connect (char *hostname, int port) /* datagram socket */ if (bind (s, (struct sockaddr *) &sin, sizeof (sin))) { -#ifndef HAVE_WINSOCK2 +#ifndef HAVE_WINSOCK2_H if (errno != EINPROGRESS) #else if (WSAGetLastError() != WSAEINPROGRESS) @@ -385,7 +385,7 @@ is_multicast_address (char *addr) sin.sin_family = AF_INET; -#ifndef HAVE_WINSOCK2 +#ifndef HAVE_WINSOCK2_H #ifdef HAVE_ATON inet_aton (addr, &sin.sin_addr); #else |