summaryrefslogtreecommitdiff
path: root/editors/openoffice.org-3-RC
diff options
context:
space:
mode:
authorMartin Blapp <mbr@FreeBSD.org>2002-03-10 22:42:07 +0000
committerMartin Blapp <mbr@FreeBSD.org>2002-03-10 22:42:07 +0000
commita8e4dd73bbe65155ae2992e5ae09fe195c8500e6 (patch)
tree41a3e23fcb8527ca94b84df94c85a470d75a941b /editors/openoffice.org-3-RC
parentAdd -f to ln to continue builds (diff)
AddrLen is socklen_t, not int
Notes
Notes: svn path=/head/; revision=55833
Diffstat (limited to 'editors/openoffice.org-3-RC')
-rw-r--r--editors/openoffice.org-3-RC/files/patch-sal+osl+unx+socket.c13
-rw-r--r--editors/openoffice.org-3-RC/files/patch-sal::osl::unx::socket.c13
2 files changed, 22 insertions, 4 deletions
diff --git a/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+socket.c b/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+socket.c
index 4c63598da424..19d390cf08eb 100644
--- a/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+socket.c
+++ b/editors/openoffice.org-3-RC/files/patch-sal+osl+unx+socket.c
@@ -1,5 +1,5 @@
---- ../sal/osl/unx/socket.c.orig Sun Mar 3 18:12:48 2002
-+++ ../sal/osl/unx/socket.c Sun Mar 3 18:16:32 2002
+--- ../sal/osl/unx/socket.c.orig Fri Jun 22 16:22:14 2001
++++ ../sal/osl/unx/socket.c Sun Mar 10 23:33:56 2002
@@ -82,7 +82,7 @@
#undef HAVE_POLL_H
#endif
@@ -9,3 +9,12 @@
#include <sys/poll.h>
#define HAVE_POLL_H
#endif /* HAVE_POLL_H */
+@@ -1965,7 +1965,7 @@
+ /*****************************************************************************/
+ oslSocketAddr SAL_CALL osl_getLocalAddrOfSocket(oslSocket pSocket)
+ {
+-#ifdef LINUX
++#ifdef LINUX || defined(FREEBSD)
+ socklen_t AddrLen;
+ #else
+ /* mfe: Solaris 'cc +w' means Addrlen should be signed! */
diff --git a/editors/openoffice.org-3-RC/files/patch-sal::osl::unx::socket.c b/editors/openoffice.org-3-RC/files/patch-sal::osl::unx::socket.c
index 4c63598da424..19d390cf08eb 100644
--- a/editors/openoffice.org-3-RC/files/patch-sal::osl::unx::socket.c
+++ b/editors/openoffice.org-3-RC/files/patch-sal::osl::unx::socket.c
@@ -1,5 +1,5 @@
---- ../sal/osl/unx/socket.c.orig Sun Mar 3 18:12:48 2002
-+++ ../sal/osl/unx/socket.c Sun Mar 3 18:16:32 2002
+--- ../sal/osl/unx/socket.c.orig Fri Jun 22 16:22:14 2001
++++ ../sal/osl/unx/socket.c Sun Mar 10 23:33:56 2002
@@ -82,7 +82,7 @@
#undef HAVE_POLL_H
#endif
@@ -9,3 +9,12 @@
#include <sys/poll.h>
#define HAVE_POLL_H
#endif /* HAVE_POLL_H */
+@@ -1965,7 +1965,7 @@
+ /*****************************************************************************/
+ oslSocketAddr SAL_CALL osl_getLocalAddrOfSocket(oslSocket pSocket)
+ {
+-#ifdef LINUX
++#ifdef LINUX || defined(FREEBSD)
+ socklen_t AddrLen;
+ #else
+ /* mfe: Solaris 'cc +w' means Addrlen should be signed! */