aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans-Christoph Steiner <eighthave@users.sourceforge.net>2007-01-17 15:38:05 +0000
committerHans-Christoph Steiner <eighthave@users.sourceforge.net>2007-01-17 15:38:05 +0000
commit225141bb224fe7f487a89406792d8a1da3a89b6b (patch)
treea38c0f164148659985474bd9ce5944c7b5330a04
parent90d9f039bc67f902dcb0525354b65b58c540bd2d (diff)
checked in Stephen Sinclair's MinGW fix, patch 1629160
svn path=/trunk/externals/OSCx/; revision=7361
-rw-r--r--src/dumpOSC.c4
-rw-r--r--src/htmsocket.c1
2 files changed, 3 insertions, 2 deletions
diff --git a/src/dumpOSC.c b/src/dumpOSC.c
index d495442..81f5b13 100644
--- a/src/dumpOSC.c
+++ b/src/dumpOSC.c
@@ -95,6 +95,7 @@ The OSC webpage is http://cnmat.cnmat.berkeley.edu/OpenSoundControl
#include <ctype.h>
#include <signal.h>
#include <stdio.h>
+ #include <ws2tcpip.h>
#else
#include <stdio.h>
#include <string.h>
@@ -306,12 +307,11 @@ static void *dumpOSC_new(t_symbol *compatflag,
struct ip_mreq mreq;
mreq.imr_multiaddr.s_addr = inet_addr(castgroup->s_name);
mreq.imr_interface.s_addr = htonl(INADDR_ANY);
- if (setsockopt(sockfd,IPPROTO_IP,IP_ADD_MEMBERSHIP,&mreq,sizeof(mreq)) < 0) {
+ if (setsockopt(sockfd,IPPROTO_IP,IP_ADD_MEMBERSHIP,(char*)&mreq,sizeof(mreq)) < 0) {
sys_sockerror("setsockopt");
}
}
-
/* name the socket */
if (bind(sockfd, (struct sockaddr *)&server, sizeof(server)) < 0)
{
diff --git a/src/htmsocket.c b/src/htmsocket.c
index 36b1d1a..858a4c7 100644
--- a/src/htmsocket.c
+++ b/src/htmsocket.c
@@ -55,6 +55,7 @@ The OSC webpage is http://cnmat.cnmat.berkeley.edu/OpenSoundControl
#include <stdlib.h>
#include "OSC-common.h"
#include <stdio.h>
+ #include <ws2tcpip.h>
#else
#include <stdio.h>
#include <unistd.h>