Fix build on Solaris. Fixes bug #568480.

Fix linking on Solaris by checking for the nsl and socket
libraries which are needed for socket() and gethostbyname().

Don't initialize some fields of struct mh to NULL/0, they're
already set to NULL/0 by a memset(). Also this fields don't
exist on Solaris.
This commit is contained in:
Brian Cameron 2009-01-23 10:11:52 +01:00 committed by Sebastian Dröge
parent 7ce5b5a2d6
commit 486d76b454
2 changed files with 4 additions and 4 deletions

View file

@ -157,6 +157,10 @@ dnl *** checks for library functions ***
dnl *** checks for dependency libraries *** dnl *** checks for dependency libraries ***
dnl *** checks for socket and nsl libraries ***
AC_CHECK_FUNC(socket,,[AC_CHECK_LIB(socket,socket)])
AC_CHECK_FUNC(gethostbyname,,[AC_CHECK_LIB(nsl,gethostbyname)])
dnl GLib is required dnl GLib is required
AG_GST_GLIB_CHECK([2.6]) AG_GST_GLIB_CHECK([2.6])

View file

@ -141,8 +141,6 @@ gst_dccp_read_buffer (GstElement * this, int socket, GstBuffer ** buf)
iov.iov_len = readsize; iov.iov_len = readsize;
mh.msg_iov = &iov; mh.msg_iov = &iov;
mh.msg_iovlen = 1; mh.msg_iovlen = 1;
mh.msg_control = NULL;
mh.msg_controllen = 0;
bytes_read = recvmsg (socket, &mh, 0); bytes_read = recvmsg (socket, &mh, 0);
@ -324,8 +322,6 @@ gst_dccp_socket_write (GstElement * element, int socket, const void *buf,
iov.iov_len = MIN (packet_size, size - bytes_written); iov.iov_len = MIN (packet_size, size - bytes_written);
mh.msg_iov = &iov; mh.msg_iov = &iov;
mh.msg_iovlen = 1; mh.msg_iovlen = 1;
mh.msg_control = NULL;
mh.msg_controllen = 0;
wrote = sendmsg (socket, &mh, 0); wrote = sendmsg (socket, &mh, 0);
} while (wrote == -1 && errno == EAGAIN); } while (wrote == -1 && errno == EAGAIN);