RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Convert HAVE_WINSOCK2_H into a 0/1 definition. 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28437 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2009-02-01 13:42:27 +00:00
parent 12b7948773
commit 0f65d3be9d
20 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -2911,7 +2911,7 @@ if test $_winsock2_h = yes ; then
_ld_sock="-lws2_32"
def_winsock2_h='#define HAVE_WINSOCK2_H 1'
else
def_winsock2_h='#undef HAVE_WINSOCK2_H'
def_winsock2_h='#define HAVE_WINSOCK2_H 0'
fi

2
stream/asf_mmst_streaming.c
View File

@ -39,7 +39,7 @@
#include "mp_msg.h"
#include "help_mp.h"
#ifdef HAVE_WINSOCK2_H
#if HAVE_WINSOCK2_H
#include <winsock2.h>
#endif

2
stream/asf_streaming.c
View File

@ -9,7 +9,7 @@
#include "mp_msg.h"
#include "help_mp.h"
#ifdef HAVE_WINSOCK2_H
#if HAVE_WINSOCK2_H
#include <winsock2.h>
#endif

2
stream/http.c
View File

@ -11,7 +11,7 @@
#include <string.h>
#include <unistd.h>
#ifndef HAVE_WINSOCK2_H
#if !HAVE_WINSOCK2_H
#else
#include <winsock2.h>
#include <ws2tcpip.h>

4
stream/librtsp/rtsp.c
View File

@ -42,7 +42,7 @@
#include <sys/time.h>
#include <sys/types.h>
#include <inttypes.h>
#ifdef HAVE_WINSOCK2_H
#if HAVE_WINSOCK2_H
#include <winsock2.h>
#else
#include <sys/socket.h>
@ -72,7 +72,7 @@ static int write_stream(int s, const char *buf, int len) {
if (n > 0)
total += n;
else if (n < 0) {
#ifndef HAVE_WINSOCK2_H
#if !HAVE_WINSOCK2_H
if ((timeout>0) && ((errno == EAGAIN) || (errno == EINPROGRESS))) {
#else
if ((timeout>0) && ((errno == EAGAIN) || (WSAGetLastError() == WSAEINPROGRESS))) {

10
stream/librtsp/rtsp_rtp.c
View File

@ -28,7 +28,7 @@
#include "config.h"
#ifndef HAVE_WINSOCK2_H
#if !HAVE_WINSOCK2_H
#include <netdb.h>
#include <netinet/in.h>
#include <sys/socket.h>
@ -251,7 +251,7 @@ rtcp_connect (int client_port, int server_port, const char* server_hostname)
if (bind (s, (struct sockaddr *) &sin, sizeof (sin)))
{
#ifndef HAVE_WINSOCK2_H
#if !HAVE_WINSOCK2_H
if (errno != EINPROGRESS)
#else
if (WSAGetLastError() != WSAEINPROGRESS)
@ -297,7 +297,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_H
#if !HAVE_WINSOCK2_H
#if HAVE_INET_ATON
inet_aton (hostname, &sin.sin_addr);
#else
@ -332,7 +332,7 @@ rtp_connect (char *hostname, int port)
/* datagram socket */
if (bind (s, (struct sockaddr *) &sin, sizeof (sin)))
{
#ifndef HAVE_WINSOCK2_H
#if !HAVE_WINSOCK2_H
if (errno != EINPROGRESS)
#else
if (WSAGetLastError() != WSAEINPROGRESS)
@ -386,7 +386,7 @@ is_multicast_address (char *addr)
sin.sin_family = AF_INET;
#ifndef HAVE_WINSOCK2_H
#if !HAVE_WINSOCK2_H
#if HAVE_INET_ATON
inet_aton (addr, &sin.sin_addr);
#else

2
stream/librtsp/rtsp_session.c
View File

@ -30,7 +30,7 @@
#include <sys/types.h>
#include "config.h"
#ifndef HAVE_WINSOCK2_H
#if !HAVE_WINSOCK2_H
#include <sys/socket.h>
#include <netinet/in.h>
#include <netdb.h>

2
stream/network.c
View File

@ -19,7 +19,7 @@
#include "mp_msg.h"
#include "help_mp.h"
#ifdef HAVE_WINSOCK2_H
#if HAVE_WINSOCK2_H
#include <winsock2.h>
#include <ws2tcpip.h>
#endif

2
stream/network.h
View File

@ -12,7 +12,7 @@
#include <sys/types.h>
#include "config.h"
#ifndef HAVE_WINSOCK2_H
#if !HAVE_WINSOCK2_H
#include <netdb.h>
#include <netinet/in.h>
#include <sys/socket.h>

4
stream/pnm.c
View File

@ -35,7 +35,7 @@
#include <stdlib.h>
#include <sys/time.h>
#include <inttypes.h>
#ifndef HAVE_WINSOCK2_H
#if !HAVE_WINSOCK2_H
#include <sys/socket.h>
//#include <netinet/in.h>
//#include <netdb.h>
@ -204,7 +204,7 @@ static int rm_write(int s, const char *buf, int len) {
if (n > 0)
total += n;
else if (n < 0) {
#ifndef HAVE_WINSOCK2_H
#if !HAVE_WINSOCK2_H
if (timeout>0 && (errno == EAGAIN || errno == EINPROGRESS)) {
#else
if (timeout>0 && (errno == EAGAIN || WSAGetLastError() == WSAEINPROGRESS)) {

2
stream/realrtsp/rmff.h
View File

@ -31,7 +31,7 @@
#include <sys/types.h>
#include "config.h"
#ifndef HAVE_WINSOCK2_H
#if !HAVE_WINSOCK2_H
#include <sys/socket.h>
#include <netinet/in.h>
#include <netdb.h>

2
stream/rtp.c
View File

@ -13,7 +13,7 @@
#include <sys/types.h>
#include <ctype.h>
#include "config.h"
#ifndef HAVE_WINSOCK2_H
#if !HAVE_WINSOCK2_H
#include <netinet/in.h>
#include <sys/socket.h>
#include <arpa/inet.h>

6
stream/stream.c
View File

@ -14,7 +14,7 @@
#include "config.h"
#ifdef HAVE_WINSOCK2_H
#if HAVE_WINSOCK2_H
#include <winsock2.h>
#endif
@ -408,7 +408,7 @@ stream_t* new_stream(int fd,int type){
if(s==NULL) return NULL;
memset(s,0,sizeof(stream_t));
#ifdef HAVE_WINSOCK2_H
#if HAVE_WINSOCK2_H
{
WSADATA wsdata;
int temp = WSAStartup(0x0202, &wsdata); // there might be a better place for this (-> later)
@ -443,7 +443,7 @@ void free_stream(stream_t *s){
closesocket(s->fd);
else close(s->fd);
}
#ifdef HAVE_WINSOCK2_H
#if HAVE_WINSOCK2_H
mp_msg(MSGT_STREAM,MSGL_V,"WINSOCK2 uninit\n");
WSACleanup(); // there might be a better place for this (-> later)
#endif

2
stream/stream_cddb.c
View File

@ -27,7 +27,7 @@
#define mkdir(a,b) mkdir(a)
#endif
#include <windows.h>
#ifdef HAVE_WINSOCK2_H
#if HAVE_WINSOCK2_H
#include <winsock2.h>
#endif
#else

2
stream/stream_ftp.c
View File

@ -9,7 +9,7 @@
#include <fcntl.h>
#include <unistd.h>
#include <errno.h>
#ifndef HAVE_WINSOCK2_H
#if !HAVE_WINSOCK2_H
#include <sys/socket.h>
#else
#include <winsock2.h>

6
stream/stream_netstream.c
View File

@ -42,7 +42,7 @@
#include <inttypes.h>
#include <errno.h>
#ifndef HAVE_WINSOCK2_H
#if !HAVE_WINSOCK2_H
#include <sys/socket.h>
#include <netinet/in.h>
#include <arpa/inet.h>
@ -90,7 +90,7 @@ static const struct m_struct_st stream_opts = {
//// When the cache is running we need a lock as
//// fill_buffer is called from another proccess
static int lock_fd(int fd) {
#ifndef HAVE_WINSOCK2_H
#if !HAVE_WINSOCK2_H
struct flock lock;
memset(&lock,0,sizeof(struct flock));
@ -113,7 +113,7 @@ printf("FIXME? should lock here\n");
}
static int unlock_fd(int fd) {
#ifndef HAVE_WINSOCK2_H
#if !HAVE_WINSOCK2_H
struct flock lock;
memset(&lock,0,sizeof(struct flock));

2
stream/stream_netstream.h
View File

@ -14,7 +14,7 @@
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#ifndef HAVE_WINSOCK2_H
#if !HAVE_WINSOCK2_H
#include <sys/socket.h>
#endif
#include "mp_msg.h"

2
stream/stream_rtsp.c
View File

@ -28,7 +28,7 @@
#include <sys/types.h>
#include <ctype.h>
#include "config.h"
#ifndef HAVE_WINSOCK2_H
#if !HAVE_WINSOCK2_H
#include <netinet/in.h>
#include <sys/socket.h>
#include <arpa/inet.h>

16
stream/tcp.c
View File

@ -20,7 +20,7 @@
#include "mp_msg.h"
#include "help_mp.h"
#ifndef HAVE_WINSOCK2_H
#if !HAVE_WINSOCK2_H
#include <netdb.h>
#include <netinet/in.h>
#include <sys/socket.h>
@ -75,7 +75,7 @@ connect2Server_with_af(char *host, int port, int af,int verb) {
struct hostent *hp=NULL;
char buf[255];
#ifdef HAVE_WINSOCK2_H
#if HAVE_WINSOCK2_H
unsigned long val;
int to;
#else
@ -91,7 +91,7 @@ connect2Server_with_af(char *host, int port, int af,int verb) {
}
#if defined(SO_RCVTIMEO) && defined(SO_SNDTIMEO)
#ifdef HAVE_WINSOCK2_H
#if HAVE_WINSOCK2_H
/* timeout in milliseconds */
to = 10 * 1000;
#else
@ -115,7 +115,7 @@ connect2Server_with_af(char *host, int port, int af,int verb) {
memset(&server_address, 0, sizeof(server_address));
#ifndef HAVE_WINSOCK2_H
#if !HAVE_WINSOCK2_H
#if HAVE_INET_ATON
if (inet_aton(host, our_s_addr)!=1)
#else
@ -139,7 +139,7 @@ connect2Server_with_af(char *host, int port, int af,int verb) {
memcpy( our_s_addr, (void*)hp->h_addr_list[0], hp->h_length );
}
#ifdef HAVE_WINSOCK2_H
#if HAVE_WINSOCK2_H
else {
unsigned long addr = inet_addr(host);
memcpy( our_s_addr, (void*)&addr, sizeof(addr) );
@ -172,14 +172,14 @@ connect2Server_with_af(char *host, int port, int af,int verb) {
if(verb) mp_msg(MSGT_NETWORK,MSGL_STATUS,MSGTR_MPDEMUX_NW_ConnectingToServer, host, buf , port );
// Turn the socket as non blocking so we can timeout on the connection
#ifndef HAVE_WINSOCK2_H
#if !HAVE_WINSOCK2_H
fcntl( socket_server_fd, F_SETFL, fcntl(socket_server_fd, F_GETFL) | O_NONBLOCK );
#else
val = 1;
ioctlsocket( socket_server_fd, FIONBIO, &val );
#endif
if( connect( socket_server_fd, (struct sockaddr*)&server_address, server_address_size )==-1 ) {
#ifndef HAVE_WINSOCK2_H
#if !HAVE_WINSOCK2_H
if( errno!=EINPROGRESS ) {
#else
if( (WSAGetLastError() != WSAEINPROGRESS) && (WSAGetLastError() != WSAEWOULDBLOCK) ) {
@ -211,7 +211,7 @@ connect2Server_with_af(char *host, int port, int af,int verb) {
if (ret < 0) mp_msg(MSGT_NETWORK,MSGL_ERR,MSGTR_MPDEMUX_NW_SelectFailed);
// Turn back the socket as blocking
#ifndef HAVE_WINSOCK2_H
#if !HAVE_WINSOCK2_H
fcntl( socket_server_fd, F_SETFL, fcntl(socket_server_fd, F_GETFL) & ~O_NONBLOCK );
#else
val = 0;

10
stream/udp.c
View File

@ -31,7 +31,7 @@
#include <sys/time.h>
#include <ctype.h>
#ifndef HAVE_WINSOCK2_H
#if !HAVE_WINSOCK2_H
#include <netdb.h>
#include <netinet/in.h>
#include <sys/socket.h>
@ -74,7 +74,7 @@ udp_open_socket (URL_t *url)
if (isalpha (url->hostname[0]))
{
#ifndef HAVE_WINSOCK2_H
#if !HAVE_WINSOCK2_H
hp = (struct hostent *) gethostbyname (url->hostname);
if (!hp)
{
@ -91,7 +91,7 @@ udp_open_socket (URL_t *url)
}
else
{
#ifndef HAVE_WINSOCK2_H
#if !HAVE_WINSOCK2_H
#if HAVE_INET_ATON
inet_aton (url->hostname, &server_address.sin_addr);
#else
@ -110,7 +110,7 @@ udp_open_socket (URL_t *url)
if (bind (socket_server_fd, (struct sockaddr *) &server_address,
sizeof (server_address)) == -1)
{
#ifndef HAVE_WINSOCK2_H
#if !HAVE_WINSOCK2_H
if (errno != EINPROGRESS)
#else
if (WSAGetLastError () != WSAEINPROGRESS)
@ -122,7 +122,7 @@ udp_open_socket (URL_t *url)
}
}
#ifdef HAVE_WINSOCK2_H
#if HAVE_WINSOCK2_H
if (isalpha (url->hostname[0]))
{
hp = (struct hostent *) gethostbyname (url->hostname);