[polypaudio-commits] r742 - in /trunk: configure.ac src/modules/rtp/rtp.c src/modules/rtp/sap.c

[svnmailer-noreply at 0pointer.de]

Author: ossman
Date: Tue Apr 18 16:09:56 2006
New Revision: 742

URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=742&root=polypaudio&view=rev
Log:
More fixes caused by Sun's complete inability to follow any standard
whatsoever.

Modified:
    trunk/configure.ac
    trunk/src/modules/rtp/rtp.c
    trunk/src/modules/rtp/sap.c

Modified: trunk/configure.ac
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/configure.ac?rev=742&root=polypaudio&r1=741&r2=742&view=diff
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Tue Apr 18 16:09:56 2006
@@ -36,6 +36,16 @@
    ac_default_prefix="/usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION}"
 fi
 
+#### Platform hacks ####
+
+case $host in
+   *-*-solaris* )
+      AC_DEFINE(_XOPEN_SOURCE_EXTENDED, 1, Needed to get declarations for msg_control and msg_controllen on Solaris)
+      AC_DEFINE(_XOPEN_SOURCE,          2, Needed to get declarations for msg_control and msg_controllen on Solaris)
+      AC_DEFINE(__EXTENSIONS__,         1, Needed to get declarations for msg_control and msg_controllen on Solaris)
+      ;;
+esac
+
 #### Checks for programs. ####
 
 # CC
@@ -157,6 +167,9 @@
 AC_CHECK_HEADERS([linux/input.h], [HAVE_EVDEV=1], [HAVE_EVDEV=0])
 
 AM_CONDITIONAL([HAVE_EVDEV], [test "x$HAVE_EVDEV" = "x1"])
+
+# Solaris
+AC_CHECK_HEADERS([sys/filio.h])
 
 # Windows
 AC_CHECK_HEADERS([windows.h winsock2.h ws2tcpip.h])

Modified: trunk/src/modules/rtp/rtp.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/rtp/rtp.c?rev=742&root=polypaudio&r1=741&r2=742&view=diff
==============================================================================
--- trunk/src/modules/rtp/rtp.c (original)
+++ trunk/src/modules/rtp/rtp.c Tue Apr 18 16:09:56 2006
@@ -32,6 +32,10 @@
 #include <unistd.h>
 #include <sys/ioctl.h>
 
+#ifdef HAVE_SYS_FILIO_H
+#include <sys/filio.h>
+#endif
+
 #include <polypcore/log.h>
 
 #include "rtp.h"
@@ -74,7 +78,7 @@
             size_t k = n + chunk.length > size ? size - n : chunk.length;
 
             if (chunk.memblock) {
-                iov[iov_idx].iov_base = (uint8_t*) chunk.memblock->data + chunk.index;
+                iov[iov_idx].iov_base = (void*)((uint8_t*) chunk.memblock->data + chunk.index);
                 iov[iov_idx].iov_len = k;
                 mb[iov_idx] = chunk.memblock;
                 iov_idx ++;
@@ -96,7 +100,7 @@
                 header[1] = htonl(c->timestamp);
                 header[2] = htonl(c->ssrc);
 
-                iov[0].iov_base = header;
+                iov[0].iov_base = (void*)header;
                 iov[0].iov_len = sizeof(header);
                 
                 m.msg_name = NULL;

Modified: trunk/src/modules/rtp/sap.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/modules/rtp/sap.c?rev=742&root=polypaudio&r1=741&r2=742&view=diff
==============================================================================
--- trunk/src/modules/rtp/sap.c (original)
+++ trunk/src/modules/rtp/sap.c Tue Apr 18 16:09:56 2006
@@ -34,6 +34,10 @@
 #include <unistd.h>
 #include <sys/ioctl.h>
 
+#ifdef HAVE_SYS_FILIO_H
+#include <sys/filio.h>
+#endif
+
 #include <polypcore/util.h>
 #include <polypcore/log.h>
 #include <polypcore/xmalloc.h>