diff options
| author | vs <vs@FreeBSD.org> | 2005-04-24 22:51:35 +0800 |
|---|---|---|
| committer | vs <vs@FreeBSD.org> | 2005-04-24 22:51:35 +0800 |
| commit | c42ad34580b79c0d8d8a440a99e26a648a3f225b (patch) | |
| tree | 2d41588bd2db07029f285377f627349f0b3b33ef | |
| parent | 38c4b975bc6db364299583d240c8f95cc1b497f5 (diff) | |
| download | freebsd-ports-graphics-c42ad34580b79c0d8d8a440a99e26a648a3f225b.tar.gz freebsd-ports-graphics-c42ad34580b79c0d8d8a440a99e26a648a3f225b.tar.zst freebsd-ports-graphics-c42ad34580b79c0d8d8a440a99e26a648a3f225b.zip | |
Unbreak (at least on 4.11). Also, merge two patches to same file but contained
in two different patch-files where one even had a misleading name.
| -rw-r--r-- | devel/flowdesigner/files/patch-SocketStream.h | 24 | ||||
| -rw-r--r-- | devel/flowdesigner/files/patch-data-flow_src_SocketStream.cc | 12 |
2 files changed, 24 insertions, 12 deletions
diff --git a/devel/flowdesigner/files/patch-SocketStream.h b/devel/flowdesigner/files/patch-SocketStream.h index fe24c510579..7da457249ec 100644 --- a/devel/flowdesigner/files/patch-SocketStream.h +++ b/devel/flowdesigner/files/patch-SocketStream.h @@ -1,11 +1,17 @@ ---- data-flow/src/SocketStream.cc.orig Thu Aug 26 18:31:31 2004 -+++ data-flow/src/SocketStream.cc Thu Mar 10 17:36:08 2005 -@@ -190,7 +190,7 @@ +--- data-flow/include/SocketStream.h.orig ++++ data-flow/include/SocketStream.h +@@ -5,13 +5,13 @@ + //Dominic Letourneau 03/10/2001 - size_t packet_len = 0; - unsigned int flags = 0; -- size_t addr_len = sizeof(m_read_addr); -+ socklen_t addr_len = sizeof(m_read_addr); + #include <stddef.h> ++#include <sys/types.h> + #include <sys/socket.h> + #include <netinet/in.h> + #include "Object.h" + #include "net_types.h" + #include <iostream> + #include <stdio.h> +-#include <sys/types.h> + #include <sys/stat.h> + #include <fcntl.h> - switch (m_type) { - case BROADCAST_TYPE: diff --git a/devel/flowdesigner/files/patch-data-flow_src_SocketStream.cc b/devel/flowdesigner/files/patch-data-flow_src_SocketStream.cc index e12d149d493..4c27b4deebe 100644 --- a/devel/flowdesigner/files/patch-data-flow_src_SocketStream.cc +++ b/devel/flowdesigner/files/patch-data-flow_src_SocketStream.cc @@ -1,6 +1,12 @@ ---- data-flow/src/SocketStream.cc.orig Tue Mar 8 18:52:37 2005 -+++ data-flow/src/SocketStream.cc Tue Mar 8 18:21:43 2005 -@@ -195,7 +195,7 @@ size_t network_socket::recv_packet(unsig +--- data-flow/src/SocketStream.cc.orig Sun Apr 24 15:16:43 2005 ++++ data-flow/src/SocketStream.cc Sun Apr 24 15:16:32 2005 +@@ -190,12 +190,12 @@ + + size_t packet_len = 0; + unsigned int flags = 0; +- size_t addr_len = sizeof(m_read_addr); ++ socklen_t addr_len = sizeof(m_read_addr); + switch (m_type) { case BROADCAST_TYPE: |