kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Unbreak (at least on 4.11). Also, merge two patches to same file but contained

Browse source 
in two different patch-files where one even had a misleading name.
This commit is contained in:
Volker Stolz 2005-04-24 14:51:35 +00:00
parent 73d186434c
commit eb1a35f08a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=134063
2 changed files with 24 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
devel/flowdesigner/files/patch-SocketStream.h
View file

@ -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:

12
devel/flowdesigner/files/patch-data-flow_src_SocketStream.cc
View file

@ -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: