mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 05:16:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

dccp: use socklen_t where appropriate rather than specific type

Browse source 
In particular, fixes Cygwin build where socklen_t is defined as int
in line with native win32 api definition.
This commit is contained in:
Mark Nauwelaerts 2011-01-31 17:24:24 +01:00
parent 17c2b30e9b
commit c32a99559d
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gst/dccp/gstdccp.c
View file

@ -241,18 +241,14 @@ gst_dccp_server_wait_connections (GstElement * element, int server_sock_fd)
/* new client */ /* new client */
int client_sock_fd; int client_sock_fd;
struct sockaddr_in client_address; struct sockaddr_in client_address;
unsigned int client_address_len; socklen_t client_address_len;
memset (&client_address, 0, sizeof (client_address)); memset (&client_address, 0, sizeof (client_address));
client_address_len = 0; client_address_len = 0;
if ((client_sock_fd = if ((client_sock_fd =
accept (server_sock_fd, (struct sockaddr *) &client_address, accept (server_sock_fd, (struct sockaddr *) &client_address,
#ifndef G_OS_WIN32
&client_address_len)) == -1) { &client_address_len)) == -1) {
#else
(int *) &client_address_len)) == -1) {
#endif
GST_ELEMENT_ERROR (element, RESOURCE, OPEN_WRITE, (NULL), GST_ELEMENT_ERROR (element, RESOURCE, OPEN_WRITE, (NULL),
("Could not accept client on server socket %d: %s (%d)", ("Could not accept client on server socket %d: %s (%d)",
server_sock_fd, g_strerror (errno), errno)); server_sock_fd, g_strerror (errno), errno));

3
gst/dccp/gstdccp_common.h
View file

@ -32,6 +32,9 @@
# define WINVER 0x0501 # define WINVER 0x0501
# include <winsock2.h> # include <winsock2.h>
# include <ws2tcpip.h> # include <ws2tcpip.h>
#ifndef socklen_t
#define socklen_t int
#endif
#endif #endif
#include <sys/types.h> #include <sys/types.h>
#include <unistd.h> #include <unistd.h>