From 4ddc89a36ab33d0b660b7312b9b9f9557e820a78 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <eighthave@users.sourceforge.net>
Date: Sun, 4 Apr 2004 22:10:41 +0000
Subject: cleaned up build system, especially for Darwin/MacOS X

svn path=/trunk/externals/OSCx/; revision=1549
---
 send+dump/Makefile.in | 4 +---
 send+dump/dumpOSC.c   | 8 ++++++--
 send+dump/htmsocket.c | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'send+dump')

diff --git a/send+dump/Makefile.in b/send+dump/Makefile.in
index 6ff1cf2..2927d63 100644
--- a/send+dump/Makefile.in
+++ b/send+dump/Makefile.in
@@ -2,8 +2,6 @@ LIBOSCDIR = ../libOSC
 LIBOSC = ${LIBOSCDIR}/libOSC.a
 # for eg. linux
 # DEFS= -Dunix
-# for MAC OSX, should be DARWIN
-# DEFS=-Dunix -DMACOSX
 
 CFLAGS= @CFLAGS@
 # INCLUDES= @INCLUDES@
@@ -18,7 +16,7 @@ sendOSC: sendOSC.o htmsocket.o ${LIBOSC}
 
 dumpOSC: ${DUMPOBJS}
 	${CC} ${CFLAGS} $(INCLUDES) -o $@ ${DUMPOBJS}
-	
+
 dumpUDP: dumpUDP.o
 	${CC} ${CFLAGS} $(INCLUDES) -o dumpUDP dumpUDP.o
 
diff --git a/send+dump/dumpOSC.c b/send+dump/dumpOSC.c
index 63efc38..14a0e84 100644
--- a/send+dump/dumpOSC.c
+++ b/send+dump/dumpOSC.c
@@ -83,7 +83,7 @@ Technologies, University of California, Berkeley.
 #include <signal.h>
 #include <grp.h>
 #include <sys/file.h>
-#ifndef MACOSX
+#ifndef __APPLE__
   #include <sys/prctl.h>
   #include <bits/sigset.h>
 #endif
@@ -116,7 +116,9 @@ Boolean ClientReply(int packetsize, void *packet, int socketfd,
 void sgi_CleanExit(void);
 Boolean sgi_HaveToQuit(void);
 int RegisterPollingDevice(int fd, void (*callbackfunction)(int , void *), void *dummy);
+#ifndef __APPLE__
 static void catch_sigint();
+#endif
 static int Synthmessage(char *m, int n, void *clientdesc, int clientdesclength, int fd) ;
 void ParseOSCPacket(char *buf, int n, ClientAddr returnAddr);
 static void Smessage(char *address, void *v, int n, ClientAddr returnAddr);
@@ -232,9 +234,11 @@ int RegisterPollingDevice(int fd, void (*callbackfunction)(int , void *), void *
 
 static int caught_sigint;
 
+#ifndef __APPLE__
 static void catch_sigint()  {
    caught_sigint = 1;
 }
+#endif
 static int sockfd, usockfd;
 
 
@@ -634,7 +638,7 @@ printf("polldev %d\n", polldevs[j].fd);
 		printf("nfds %d\n", nfds);
 */
 		caught_sigint = 0;
-#ifndef MACOSX
+#ifndef __APPLE__
    		sigset(SIGINT, catch_sigint);       /* set sig handler       */
 #endif	
 		while(!caught_sigint)
diff --git a/send+dump/htmsocket.c b/send+dump/htmsocket.c
index 1788cc3..a3e3190 100644
--- a/send+dump/htmsocket.c
+++ b/send+dump/htmsocket.c
@@ -62,7 +62,7 @@ University of California, Berkeley.
 #include <sys/file.h>
 #include <sys/time.h>
 #include <sys/types.h>
-#ifndef MACOSX
+#ifndef __APPLE__
   #include <sys/prctl.h>
 #endif
 
-- 
cgit v1.2.1