Update of /cvsroot/pure-data/externals/OSCx/send+dump In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21579
Modified Files: Makefile dumpOSC.c htmsocket.c Log Message: fixed some OSX stuff
Index: Makefile =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/send+dump/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile 20 Oct 2002 16:01:10 -0000 1.2 --- Makefile 13 Feb 2004 00:34:33 -0000 1.3 *************** *** 1,6 **** LIBOSCDIR = ../libOSC LIBOSC = ${LIBOSCDIR}/libOSC.a ! CFLAGS= -O2 -I$(LIBOSCDIR) -Wall ! DEFS= -Dunix
DUMPOBJS=dumpOSC.o --- 1,10 ---- LIBOSCDIR = ../libOSC LIBOSC = ${LIBOSCDIR}/libOSC.a ! # for eg. linux ! # DEFS= -Dunix ! # for MAC OSX, should be DARWIN ! DEFS=-Dunix -DMACOSX ! ! CFLAGS= -O2 -I$(LIBOSCDIR) $(DEFS) -Wall
DUMPOBJS=dumpOSC.o *************** *** 20,23 **** --- 24,28 ---- ${LIBOSC}: echo "You need to go to " ${LIBOSCDIR} " and do a make." + (cd ../libOSC ; make)
clean:
Index: dumpOSC.c =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/send+dump/dumpOSC.c,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** dumpOSC.c 10 Jun 2003 20:32:14 -0000 1.3 --- dumpOSC.c 13 Feb 2004 00:34:33 -0000 1.4 *************** *** 84,89 **** #include <grp.h> #include <sys/file.h> ! #include <sys/prctl.h> ! #include <bits/sigset.h>
#ifdef NEED_SCHEDCTL_AND_LOCK --- 84,91 ---- #include <grp.h> #include <sys/file.h> ! #ifndef MACOSX ! #include <sys/prctl.h> ! #include <bits/sigset.h> ! #endif
#ifdef NEED_SCHEDCTL_AND_LOCK *************** *** 633,638 **** */ caught_sigint = 0; sigset(SIGINT, catch_sigint); /* set sig handler */ ! while(!caught_sigint) { --- 635,641 ---- */ caught_sigint = 0; + #ifndef MACOSX sigset(SIGINT, catch_sigint); /* set sig handler */ ! #endif while(!caught_sigint) {
Index: htmsocket.c =================================================================== RCS file: /cvsroot/pure-data/externals/OSCx/send+dump/htmsocket.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** htmsocket.c 6 Feb 2004 13:09:11 -0000 1.4 --- htmsocket.c 13 Feb 2004 00:34:33 -0000 1.5 *************** *** 39,42 **** --- 39,43 ----
#include <stdio.h> + #include <strings.h> #include <unistd.h> #include <sys/types.h> *************** *** 62,66 **** #include <sys/time.h> #include <sys/types.h> ! #include <sys/prctl.h>
#include <stdlib.h> --- 63,69 ---- #include <sys/time.h> #include <sys/types.h> ! #ifndef MACOSX ! #include <sys/prctl.h> ! #endif
#include <stdlib.h>