merged in fixes from branch-v0-39-2-extended so that it builds on Mac OS X, and works better with the Pd-extended build system

svn path=/trunk/externals/pidip/; revision=6886

5 files changed, 17 insertions, 27 deletions

diff --git a/modules/Makefile b/modules/Makefile
deleted file mode 100644
index 843b026..0000000
--- a/modules/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-current: all_modules
-
-include ../Makefile
-
-OBJECTS = pdp_intrusion.o  pdp_yqt.o  pdp_simura.o  pdp_underwatch.o  \
-          pdp_vertigo.o  pdp_yvu2rgb.o pdp_lens.o pdp_baltan.o \
-          pdp_aging.o pdp_ripple.o pdp_warp.o pdp_rev.o \
-          pdp_mosaic.o pdp_edge.o pdp_spiral.o pdp_radioactiv.o \
-          pdp_warhol.o pdp_nervous.o pdp_quark.o pdp_spigot.o \
-          pdp_rec~.o pdp_o.o pdp_i.o pdp_mgrid.o pdp_ctrack.o \
-          pdp_cycle.o pdp_transform.o pdp_shagadelic.o \
-          pdp_dice.o pdp_puzzle.o pdp_text.o pdp_form.o \
-          pdp_compose.o pdp_cmap.o pdp_ascii.o \
-          pdp_segsnd~.o pdp_noquark.o pdp_juxta.o \
-          pdp_smuck.o pdp_lumafilt.o \
-          pdp_transition.o pdp_imgloader.o pdp_imgsaver.o pdp_cache.o \
-          pdp_canvas.o pdp_pen.o pdp_shape.o pdp_fqt.o pdp_fcqt.o \
-          pdp_ocanvas.o pdp_spotlight.o pdp_colorgrid.o \
-	  pdp_binary.o pdp_erode.o pdp_dilate.o pdp_hitandmiss.o \
-          pdp_disintegration.o pdp_distance.o pdp_theorin~.o \
-          pdp_theorout~.o pdp_cropper.o pdp_background.o \
-          pdp_mapper.o pdp_theonice~.o pdp_icedthe~.o\
-          pdp_fdiff.o pdp_hue.o pdp_qtext.o \
-	  pdp_capture.o  # pdp_xcanvas.o pdp_aa.o
-
-all_modules: $(OBJECTS) 
diff --git a/modules/pdp_i.c b/modules/pdp_i.c
index 6971f16..790db5c 100644
--- a/modules/pdp_i.c
+++ b/modules/pdp_i.c
@@ -46,6 +46,10 @@ extern void sys_addpollfn(int fd, t_fdpollfn fn, void *ptr);
 #define SOCKET_ERROR -1
 #define INPUT_BUFFER_SIZE  1048578 /* 1 M */
 
+#ifndef MSG_NOSIGNAL
+# define MSG_NOSIGNAL SO_NOSIGPIPE
+#endif
+
 /* time-out used for select() call */
 static struct timeval ztout;
 
@@ -68,7 +72,7 @@ void pdp_i_closesocket(int fd)
 int pdp_i_setsocketoptions(int sockfd)
 { 
      int sockopt = 1;
-     if (setsockopt(sockfd, SOL_TCP, TCP_NODELAY, (const char*) &sockopt, sizeof(int)) < 0)
+     if (setsockopt(sockfd, IPPROTO_TCP, TCP_NODELAY, (const char*) &sockopt, sizeof(int)) < 0)
      {
 	  post("pdp_i : setsockopt TCP_NODELAY failed");
           perror( "setsockopt" );
diff --git a/modules/pdp_icedthe~.c b/modules/pdp_icedthe~.c
index 8d368aa..bd4970d 100644
--- a/modules/pdp_icedthe~.c
+++ b/modules/pdp_icedthe~.c
@@ -63,6 +63,10 @@
 #define THEORA_NUM_HEADER_PACKETS 3
 #define MAX_WRONG_PACKETS 10
 
+#ifndef MSG_NOSIGNAL
+# define MSG_NOSIGNAL SO_NOSIGPIPE
+#endif
+
 static char   *pdp_icedthe_version = "pdp_icedthe~: version 0.1, a theora stream reader ( ydegoyon@free.fr).";
 
 typedef struct pdp_icedthe_struct
diff --git a/modules/pdp_o.c b/modules/pdp_o.c
index 45b297b..18b173a 100644
--- a/modules/pdp_o.c
+++ b/modules/pdp_o.c
@@ -38,6 +38,10 @@
 
 #define DEFAULT_FRAME_RATE 25
 
+#ifndef MSG_NOSIGNAL
+# define MSG_NOSIGNAL SO_NOSIGPIPE
+#endif
+
 static char   *pdp_o_version = "pdp_o: version 0.1, a video stream emitter, written by ydegoyon@free.fr";
 
 typedef struct pdp_o_struct
diff --git a/modules/pdp_theonice~.c b/modules/pdp_theonice~.c
index 6299fe6..f3a7225 100644
--- a/modules/pdp_theonice~.c
+++ b/modules/pdp_theonice~.c
@@ -64,6 +64,10 @@
 #define STRBUF_SIZE 32
 #define OGG_AUDIO_SIZE 1024
 
+#ifndef MSG_NOSIGNAL
+# define MSG_NOSIGNAL SO_NOSIGPIPE
+#endif
+
 static char base64table[65] = {
     'A','B','C','D','E','F','G','H','I','J','K','L','M','N','O','P',
     'Q','R','S','T','U','V','W','X','Y','Z','a','b','c','d','e','f',