diff options
| author | Martin Blapp <mbr@FreeBSD.org> | 2002-10-22 23:15:15 +0000 |
|---|---|---|
| committer | Martin Blapp <mbr@FreeBSD.org> | 2002-10-22 23:15:15 +0000 |
| commit | 8648f0a173ad083b4a52c582ed032d9bc5a6aa20 (patch) | |
| tree | 1b0875c16afffd200afa03c19b29b0c0741851e1 /editors | |
| parent | Use SUN_LEN makro for unix domain socket name lenght. (diff) | |
Same as linux. We have <poll.h>.
Notes
Notes:
svn path=/head/; revision=68619
Diffstat (limited to 'editors')
17 files changed, 170 insertions, 68 deletions
diff --git a/editors/openoffice-1.1-devel/files/patch-sal+osl+unx+socket.c b/editors/openoffice-1.1-devel/files/patch-sal+osl+unx+socket.c index b6e0e2fa0901..9541cac8583f 100644 --- a/editors/openoffice-1.1-devel/files/patch-sal+osl+unx+socket.c +++ b/editors/openoffice-1.1-devel/files/patch-sal+osl+unx+socket.c @@ -1,14 +1,20 @@ ---- ../sal/osl/unx/socket.c.orig Sun Mar 17 12:46:37 2002 -+++ ../sal/osl/unx/socket.c Wed Apr 3 01:01:14 2002 -@@ -82,7 +82,7 @@ +--- ../sal/osl/unx/socket.c.orig Tue Apr 9 20:09:53 2002 ++++ ../sal/osl/unx/socket.c Fri Oct 18 20:00:19 2002 +@@ -82,12 +82,12 @@ #undef HAVE_POLL_H #endif -#if defined(LINUX) || defined (IRIX) || defined(NETBSD) -+#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined(FREEBSD) ++#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined ( FREEBSD ) #include <sys/poll.h> #define HAVE_POLL_H #endif /* HAVE_POLL_H */ + +-#if defined(SOLARIS) || defined ( FREEBSD ) ++#if defined(SOLARIS) + #include <poll.h> + #define HAVE_POLL_H + #endif /* SOLARIS */ @@ -1965,7 +1965,7 @@ /*****************************************************************************/ oslSocketAddr SAL_CALL osl_getLocalAddrOfSocket(oslSocket pSocket) diff --git a/editors/openoffice-1.1/files/patch-sal+osl+unx+socket.c b/editors/openoffice-1.1/files/patch-sal+osl+unx+socket.c index b6e0e2fa0901..9541cac8583f 100644 --- a/editors/openoffice-1.1/files/patch-sal+osl+unx+socket.c +++ b/editors/openoffice-1.1/files/patch-sal+osl+unx+socket.c @@ -1,14 +1,20 @@ ---- ../sal/osl/unx/socket.c.orig Sun Mar 17 12:46:37 2002 -+++ ../sal/osl/unx/socket.c Wed Apr 3 01:01:14 2002 -@@ -82,7 +82,7 @@ +--- ../sal/osl/unx/socket.c.orig Tue Apr 9 20:09:53 2002 ++++ ../sal/osl/unx/socket.c Fri Oct 18 20:00:19 2002 +@@ -82,12 +82,12 @@ #undef HAVE_POLL_H #endif -#if defined(LINUX) || defined (IRIX) || defined(NETBSD) -+#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined(FREEBSD) ++#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined ( FREEBSD ) #include <sys/poll.h> #define HAVE_POLL_H #endif /* HAVE_POLL_H */ + +-#if defined(SOLARIS) || defined ( FREEBSD ) ++#if defined(SOLARIS) + #include <poll.h> + #define HAVE_POLL_H + #endif /* SOLARIS */ @@ -1965,7 +1965,7 @@ /*****************************************************************************/ oslSocketAddr SAL_CALL osl_getLocalAddrOfSocket(oslSocket pSocket) diff --git a/editors/openoffice-2.0-devel/files/patch-sal+osl+unx+socket.c b/editors/openoffice-2.0-devel/files/patch-sal+osl+unx+socket.c index b6e0e2fa0901..9541cac8583f 100644 --- a/editors/openoffice-2.0-devel/files/patch-sal+osl+unx+socket.c +++ b/editors/openoffice-2.0-devel/files/patch-sal+osl+unx+socket.c @@ -1,14 +1,20 @@ ---- ../sal/osl/unx/socket.c.orig Sun Mar 17 12:46:37 2002 -+++ ../sal/osl/unx/socket.c Wed Apr 3 01:01:14 2002 -@@ -82,7 +82,7 @@ +--- ../sal/osl/unx/socket.c.orig Tue Apr 9 20:09:53 2002 ++++ ../sal/osl/unx/socket.c Fri Oct 18 20:00:19 2002 +@@ -82,12 +82,12 @@ #undef HAVE_POLL_H #endif -#if defined(LINUX) || defined (IRIX) || defined(NETBSD) -+#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined(FREEBSD) ++#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined ( FREEBSD ) #include <sys/poll.h> #define HAVE_POLL_H #endif /* HAVE_POLL_H */ + +-#if defined(SOLARIS) || defined ( FREEBSD ) ++#if defined(SOLARIS) + #include <poll.h> + #define HAVE_POLL_H + #endif /* SOLARIS */ @@ -1965,7 +1965,7 @@ /*****************************************************************************/ oslSocketAddr SAL_CALL osl_getLocalAddrOfSocket(oslSocket pSocket) diff --git a/editors/openoffice-3-devel/files/patch-sal+osl+unx+socket.c b/editors/openoffice-3-devel/files/patch-sal+osl+unx+socket.c index b6e0e2fa0901..9541cac8583f 100644 --- a/editors/openoffice-3-devel/files/patch-sal+osl+unx+socket.c +++ b/editors/openoffice-3-devel/files/patch-sal+osl+unx+socket.c @@ -1,14 +1,20 @@ ---- ../sal/osl/unx/socket.c.orig Sun Mar 17 12:46:37 2002 -+++ ../sal/osl/unx/socket.c Wed Apr 3 01:01:14 2002 -@@ -82,7 +82,7 @@ +--- ../sal/osl/unx/socket.c.orig Tue Apr 9 20:09:53 2002 ++++ ../sal/osl/unx/socket.c Fri Oct 18 20:00:19 2002 +@@ -82,12 +82,12 @@ #undef HAVE_POLL_H #endif -#if defined(LINUX) || defined (IRIX) || defined(NETBSD) -+#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined(FREEBSD) ++#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined ( FREEBSD ) #include <sys/poll.h> #define HAVE_POLL_H #endif /* HAVE_POLL_H */ + +-#if defined(SOLARIS) || defined ( FREEBSD ) ++#if defined(SOLARIS) + #include <poll.h> + #define HAVE_POLL_H + #endif /* SOLARIS */ @@ -1965,7 +1965,7 @@ /*****************************************************************************/ oslSocketAddr SAL_CALL osl_getLocalAddrOfSocket(oslSocket pSocket) diff --git a/editors/openoffice-3/files/patch-sal+osl+unx+socket.c b/editors/openoffice-3/files/patch-sal+osl+unx+socket.c index b6e0e2fa0901..9541cac8583f 100644 --- a/editors/openoffice-3/files/patch-sal+osl+unx+socket.c +++ b/editors/openoffice-3/files/patch-sal+osl+unx+socket.c @@ -1,14 +1,20 @@ ---- ../sal/osl/unx/socket.c.orig Sun Mar 17 12:46:37 2002 -+++ ../sal/osl/unx/socket.c Wed Apr 3 01:01:14 2002 -@@ -82,7 +82,7 @@ +--- ../sal/osl/unx/socket.c.orig Tue Apr 9 20:09:53 2002 ++++ ../sal/osl/unx/socket.c Fri Oct 18 20:00:19 2002 +@@ -82,12 +82,12 @@ #undef HAVE_POLL_H #endif -#if defined(LINUX) || defined (IRIX) || defined(NETBSD) -+#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined(FREEBSD) ++#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined ( FREEBSD ) #include <sys/poll.h> #define HAVE_POLL_H #endif /* HAVE_POLL_H */ + +-#if defined(SOLARIS) || defined ( FREEBSD ) ++#if defined(SOLARIS) + #include <poll.h> + #define HAVE_POLL_H + #endif /* SOLARIS */ @@ -1965,7 +1965,7 @@ /*****************************************************************************/ oslSocketAddr SAL_CALL osl_getLocalAddrOfSocket(oslSocket pSocket) diff --git a/editors/openoffice-devel/files/patch-sal+osl+unx+socket.c b/editors/openoffice-devel/files/patch-sal+osl+unx+socket.c index b6e0e2fa0901..9541cac8583f 100644 --- a/editors/openoffice-devel/files/patch-sal+osl+unx+socket.c +++ b/editors/openoffice-devel/files/patch-sal+osl+unx+socket.c @@ -1,14 +1,20 @@ ---- ../sal/osl/unx/socket.c.orig Sun Mar 17 12:46:37 2002 -+++ ../sal/osl/unx/socket.c Wed Apr 3 01:01:14 2002 -@@ -82,7 +82,7 @@ +--- ../sal/osl/unx/socket.c.orig Tue Apr 9 20:09:53 2002 ++++ ../sal/osl/unx/socket.c Fri Oct 18 20:00:19 2002 +@@ -82,12 +82,12 @@ #undef HAVE_POLL_H #endif -#if defined(LINUX) || defined (IRIX) || defined(NETBSD) -+#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined(FREEBSD) ++#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined ( FREEBSD ) #include <sys/poll.h> #define HAVE_POLL_H #endif /* HAVE_POLL_H */ + +-#if defined(SOLARIS) || defined ( FREEBSD ) ++#if defined(SOLARIS) + #include <poll.h> + #define HAVE_POLL_H + #endif /* SOLARIS */ @@ -1965,7 +1965,7 @@ /*****************************************************************************/ oslSocketAddr SAL_CALL osl_getLocalAddrOfSocket(oslSocket pSocket) diff --git a/editors/openoffice.org-1.1-devel/files/patch-sal+osl+unx+socket.c b/editors/openoffice.org-1.1-devel/files/patch-sal+osl+unx+socket.c index b6e0e2fa0901..9541cac8583f 100644 --- a/editors/openoffice.org-1.1-devel/files/patch-sal+osl+unx+socket.c +++ b/editors/openoffice.org-1.1-devel/files/patch-sal+osl+unx+socket.c @@ -1,14 +1,20 @@ ---- ../sal/osl/unx/socket.c.orig Sun Mar 17 12:46:37 2002 -+++ ../sal/osl/unx/socket.c Wed Apr 3 01:01:14 2002 -@@ -82,7 +82,7 @@ +--- ../sal/osl/unx/socket.c.orig Tue Apr 9 20:09:53 2002 ++++ ../sal/osl/unx/socket.c Fri Oct 18 20:00:19 2002 +@@ -82,12 +82,12 @@ #undef HAVE_POLL_H #endif -#if defined(LINUX) || defined (IRIX) || defined(NETBSD) -+#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined(FREEBSD) ++#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined ( FREEBSD ) #include <sys/poll.h> #define HAVE_POLL_H #endif /* HAVE_POLL_H */ + +-#if defined(SOLARIS) || defined ( FREEBSD ) ++#if defined(SOLARIS) + #include <poll.h> + #define HAVE_POLL_H + #endif /* SOLARIS */ @@ -1965,7 +1965,7 @@ /*****************************************************************************/ oslSocketAddr SAL_CALL osl_getLocalAddrOfSocket(oslSocket pSocket) diff --git a/editors/openoffice.org-1.1/files/patch-sal+osl+unx+socket.c b/editors/openoffice.org-1.1/files/patch-sal+osl+unx+socket.c index b6e0e2fa0901..9541cac8583f 100644 --- a/editors/openoffice.org-1.1/files/patch-sal+osl+unx+socket.c +++ b/editors/openoffice.org-1.1/files/patch-sal+osl+unx+socket.c @@ -1,14 +1,20 @@ ---- ../sal/osl/unx/socket.c.orig Sun Mar 17 12:46:37 2002 -+++ ../sal/osl/unx/socket.c Wed Apr 3 01:01:14 2002 -@@ -82,7 +82,7 @@ +--- ../sal/osl/unx/socket.c.orig Tue Apr 9 20:09:53 2002 ++++ ../sal/osl/unx/socket.c Fri Oct 18 20:00:19 2002 +@@ -82,12 +82,12 @@ #undef HAVE_POLL_H #endif -#if defined(LINUX) || defined (IRIX) || defined(NETBSD) -+#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined(FREEBSD) ++#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined ( FREEBSD ) #include <sys/poll.h> #define HAVE_POLL_H #endif /* HAVE_POLL_H */ + +-#if defined(SOLARIS) || defined ( FREEBSD ) ++#if defined(SOLARIS) + #include <poll.h> + #define HAVE_POLL_H + #endif /* SOLARIS */ @@ -1965,7 +1965,7 @@ /*****************************************************************************/ oslSocketAddr SAL_CALL osl_getLocalAddrOfSocket(oslSocket pSocket) diff --git a/editors/openoffice.org-2-RC/files/patch-sal+osl+unx+socket.c b/editors/openoffice.org-2-RC/files/patch-sal+osl+unx+socket.c index b6e0e2fa0901..9541cac8583f 100644 --- a/editors/openoffice.org-2-RC/files/patch-sal+osl+unx+socket.c +++ b/editors/openoffice.org-2-RC/files/patch-sal+osl+unx+socket.c @@ -1,14 +1,20 @@ ---- ../sal/osl/unx/socket.c.orig Sun Mar 17 12:46:37 2002 -+++ ../sal/osl/unx/socket.c Wed Apr 3 01:01:14 2002 -@@ -82,7 +82,7 @@ +--- ../sal/osl/unx/socket.c.orig Tue Apr 9 20:09:53 2002 ++++ ../sal/osl/unx/socket.c Fri Oct 18 20:00:19 2002 +@@ -82,12 +82,12 @@ #undef HAVE_POLL_H #endif -#if defined(LINUX) || defined (IRIX) || defined(NETBSD) -+#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined(FREEBSD) ++#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined ( FREEBSD ) #include <sys/poll.h> #define HAVE_POLL_H #endif /* HAVE_POLL_H */ + +-#if defined(SOLARIS) || defined ( FREEBSD ) ++#if defined(SOLARIS) + #include <poll.h> + #define HAVE_POLL_H + #endif /* SOLARIS */ @@ -1965,7 +1965,7 @@ /*****************************************************************************/ oslSocketAddr SAL_CALL osl_getLocalAddrOfSocket(oslSocket pSocket) diff --git a/editors/openoffice.org-2-devel/files/patch-sal+osl+unx+socket.c b/editors/openoffice.org-2-devel/files/patch-sal+osl+unx+socket.c index b6e0e2fa0901..9541cac8583f 100644 --- a/editors/openoffice.org-2-devel/files/patch-sal+osl+unx+socket.c +++ b/editors/openoffice.org-2-devel/files/patch-sal+osl+unx+socket.c @@ -1,14 +1,20 @@ ---- ../sal/osl/unx/socket.c.orig Sun Mar 17 12:46:37 2002 -+++ ../sal/osl/unx/socket.c Wed Apr 3 01:01:14 2002 -@@ -82,7 +82,7 @@ +--- ../sal/osl/unx/socket.c.orig Tue Apr 9 20:09:53 2002 ++++ ../sal/osl/unx/socket.c Fri Oct 18 20:00:19 2002 +@@ -82,12 +82,12 @@ #undef HAVE_POLL_H #endif -#if defined(LINUX) || defined (IRIX) || defined(NETBSD) -+#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined(FREEBSD) ++#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined ( FREEBSD ) #include <sys/poll.h> #define HAVE_POLL_H #endif /* HAVE_POLL_H */ + +-#if defined(SOLARIS) || defined ( FREEBSD ) ++#if defined(SOLARIS) + #include <poll.h> + #define HAVE_POLL_H + #endif /* SOLARIS */ @@ -1965,7 +1965,7 @@ /*****************************************************************************/ oslSocketAddr SAL_CALL osl_getLocalAddrOfSocket(oslSocket pSocket) diff --git a/editors/openoffice.org-2.0-devel/files/patch-sal+osl+unx+socket.c b/editors/openoffice.org-2.0-devel/files/patch-sal+osl+unx+socket.c index b6e0e2fa0901..9541cac8583f 100644 --- a/editors/openoffice.org-2.0-devel/files/patch-sal+osl+unx+socket.c +++ b/editors/openoffice.org-2.0-devel/files/patch-sal+osl+unx+socket.c @@ -1,14 +1,20 @@ ---- ../sal/osl/unx/socket.c.orig Sun Mar 17 12:46:37 2002 -+++ ../sal/osl/unx/socket.c Wed Apr 3 01:01:14 2002 -@@ -82,7 +82,7 @@ +--- ../sal/osl/unx/socket.c.orig Tue Apr 9 20:09:53 2002 ++++ ../sal/osl/unx/socket.c Fri Oct 18 20:00:19 2002 +@@ -82,12 +82,12 @@ #undef HAVE_POLL_H #endif -#if defined(LINUX) || defined (IRIX) || defined(NETBSD) -+#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined(FREEBSD) ++#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined ( FREEBSD ) #include <sys/poll.h> #define HAVE_POLL_H #endif /* HAVE_POLL_H */ + +-#if defined(SOLARIS) || defined ( FREEBSD ) ++#if defined(SOLARIS) + #include <poll.h> + #define HAVE_POLL_H + #endif /* SOLARIS */ @@ -1965,7 +1965,7 @@ /*****************************************************************************/ oslSocketAddr SAL_CALL osl_getLocalAddrOfSocket(oslSocket pSocket) diff --git a/editors/openoffice.org-2.0/files/patch-sal+osl+unx+socket.c b/editors/openoffice.org-2.0/files/patch-sal+osl+unx+socket.c index b6e0e2fa0901..9541cac8583f 100644 --- a/editors/openoffice.org-2.0/files/patch-sal+osl+unx+socket.c +++ b/editors/openoffice.org-2.0/files/patch-sal+osl+unx+socket.c @@ -1,14 +1,20 @@ ---- ../sal/osl/unx/socket.c.orig Sun Mar 17 12:46:37 2002 -+++ ../sal/osl/unx/socket.c Wed Apr 3 01:01:14 2002 -@@ -82,7 +82,7 @@ +--- ../sal/osl/unx/socket.c.orig Tue Apr 9 20:09:53 2002 ++++ ../sal/osl/unx/socket.c Fri Oct 18 20:00:19 2002 +@@ -82,12 +82,12 @@ #undef HAVE_POLL_H #endif -#if defined(LINUX) || defined (IRIX) || defined(NETBSD) -+#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined(FREEBSD) ++#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined ( FREEBSD ) #include <sys/poll.h> #define HAVE_POLL_H #endif /* HAVE_POLL_H */ + +-#if defined(SOLARIS) || defined ( FREEBSD ) ++#if defined(SOLARIS) + #include <poll.h> + #define HAVE_POLL_H + #endif /* SOLARIS */ @@ -1965,7 +1965,7 @@ /*****************************************************************************/ oslSocketAddr SAL_CALL osl_getLocalAddrOfSocket(oslSocket pSocket) diff --git a/editors/openoffice.org-2/files/patch-sal+osl+unx+socket.c b/editors/openoffice.org-2/files/patch-sal+osl+unx+socket.c index b6e0e2fa0901..9541cac8583f 100644 --- a/editors/openoffice.org-2/files/patch-sal+osl+unx+socket.c +++ b/editors/openoffice.org-2/files/patch-sal+osl+unx+socket.c @@ -1,14 +1,20 @@ ---- ../sal/osl/unx/socket.c.orig Sun Mar 17 12:46:37 2002 -+++ ../sal/osl/unx/socket.c Wed Apr 3 01:01:14 2002 -@@ -82,7 +82,7 @@ +--- ../sal/osl/unx/socket.c.orig Tue Apr 9 20:09:53 2002 ++++ ../sal/osl/unx/socket.c Fri Oct 18 20:00:19 2002 +@@ -82,12 +82,12 @@ #undef HAVE_POLL_H #endif -#if defined(LINUX) || defined (IRIX) || defined(NETBSD) -+#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined(FREEBSD) ++#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined ( FREEBSD ) #include <sys/poll.h> #define HAVE_POLL_H #endif /* HAVE_POLL_H */ + +-#if defined(SOLARIS) || defined ( FREEBSD ) ++#if defined(SOLARIS) + #include <poll.h> + #define HAVE_POLL_H + #endif /* SOLARIS */ @@ -1965,7 +1965,7 @@ /*****************************************************************************/ oslSocketAddr SAL_CALL osl_getLocalAddrOfSocket(oslSocket pSocket) 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 b6e0e2fa0901..9541cac8583f 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,14 +1,20 @@ ---- ../sal/osl/unx/socket.c.orig Sun Mar 17 12:46:37 2002 -+++ ../sal/osl/unx/socket.c Wed Apr 3 01:01:14 2002 -@@ -82,7 +82,7 @@ +--- ../sal/osl/unx/socket.c.orig Tue Apr 9 20:09:53 2002 ++++ ../sal/osl/unx/socket.c Fri Oct 18 20:00:19 2002 +@@ -82,12 +82,12 @@ #undef HAVE_POLL_H #endif -#if defined(LINUX) || defined (IRIX) || defined(NETBSD) -+#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined(FREEBSD) ++#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined ( FREEBSD ) #include <sys/poll.h> #define HAVE_POLL_H #endif /* HAVE_POLL_H */ + +-#if defined(SOLARIS) || defined ( FREEBSD ) ++#if defined(SOLARIS) + #include <poll.h> + #define HAVE_POLL_H + #endif /* SOLARIS */ @@ -1965,7 +1965,7 @@ /*****************************************************************************/ oslSocketAddr SAL_CALL osl_getLocalAddrOfSocket(oslSocket pSocket) diff --git a/editors/openoffice.org-3-devel/files/patch-sal+osl+unx+socket.c b/editors/openoffice.org-3-devel/files/patch-sal+osl+unx+socket.c index b6e0e2fa0901..9541cac8583f 100644 --- a/editors/openoffice.org-3-devel/files/patch-sal+osl+unx+socket.c +++ b/editors/openoffice.org-3-devel/files/patch-sal+osl+unx+socket.c @@ -1,14 +1,20 @@ ---- ../sal/osl/unx/socket.c.orig Sun Mar 17 12:46:37 2002 -+++ ../sal/osl/unx/socket.c Wed Apr 3 01:01:14 2002 -@@ -82,7 +82,7 @@ +--- ../sal/osl/unx/socket.c.orig Tue Apr 9 20:09:53 2002 ++++ ../sal/osl/unx/socket.c Fri Oct 18 20:00:19 2002 +@@ -82,12 +82,12 @@ #undef HAVE_POLL_H #endif -#if defined(LINUX) || defined (IRIX) || defined(NETBSD) -+#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined(FREEBSD) ++#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined ( FREEBSD ) #include <sys/poll.h> #define HAVE_POLL_H #endif /* HAVE_POLL_H */ + +-#if defined(SOLARIS) || defined ( FREEBSD ) ++#if defined(SOLARIS) + #include <poll.h> + #define HAVE_POLL_H + #endif /* SOLARIS */ @@ -1965,7 +1965,7 @@ /*****************************************************************************/ oslSocketAddr SAL_CALL osl_getLocalAddrOfSocket(oslSocket pSocket) diff --git a/editors/openoffice.org-3/files/patch-sal+osl+unx+socket.c b/editors/openoffice.org-3/files/patch-sal+osl+unx+socket.c index b6e0e2fa0901..9541cac8583f 100644 --- a/editors/openoffice.org-3/files/patch-sal+osl+unx+socket.c +++ b/editors/openoffice.org-3/files/patch-sal+osl+unx+socket.c @@ -1,14 +1,20 @@ ---- ../sal/osl/unx/socket.c.orig Sun Mar 17 12:46:37 2002 -+++ ../sal/osl/unx/socket.c Wed Apr 3 01:01:14 2002 -@@ -82,7 +82,7 @@ +--- ../sal/osl/unx/socket.c.orig Tue Apr 9 20:09:53 2002 ++++ ../sal/osl/unx/socket.c Fri Oct 18 20:00:19 2002 +@@ -82,12 +82,12 @@ #undef HAVE_POLL_H #endif -#if defined(LINUX) || defined (IRIX) || defined(NETBSD) -+#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined(FREEBSD) ++#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined ( FREEBSD ) #include <sys/poll.h> #define HAVE_POLL_H #endif /* HAVE_POLL_H */ + +-#if defined(SOLARIS) || defined ( FREEBSD ) ++#if defined(SOLARIS) + #include <poll.h> + #define HAVE_POLL_H + #endif /* SOLARIS */ @@ -1965,7 +1965,7 @@ /*****************************************************************************/ oslSocketAddr SAL_CALL osl_getLocalAddrOfSocket(oslSocket pSocket) diff --git a/editors/openoffice.org-vcltesttool/files/patch-sal+osl+unx+socket.c b/editors/openoffice.org-vcltesttool/files/patch-sal+osl+unx+socket.c index b6e0e2fa0901..9541cac8583f 100644 --- a/editors/openoffice.org-vcltesttool/files/patch-sal+osl+unx+socket.c +++ b/editors/openoffice.org-vcltesttool/files/patch-sal+osl+unx+socket.c @@ -1,14 +1,20 @@ ---- ../sal/osl/unx/socket.c.orig Sun Mar 17 12:46:37 2002 -+++ ../sal/osl/unx/socket.c Wed Apr 3 01:01:14 2002 -@@ -82,7 +82,7 @@ +--- ../sal/osl/unx/socket.c.orig Tue Apr 9 20:09:53 2002 ++++ ../sal/osl/unx/socket.c Fri Oct 18 20:00:19 2002 +@@ -82,12 +82,12 @@ #undef HAVE_POLL_H #endif -#if defined(LINUX) || defined (IRIX) || defined(NETBSD) -+#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined(FREEBSD) ++#if defined(LINUX) || defined (IRIX) || defined(NETBSD) || defined ( FREEBSD ) #include <sys/poll.h> #define HAVE_POLL_H #endif /* HAVE_POLL_H */ + +-#if defined(SOLARIS) || defined ( FREEBSD ) ++#if defined(SOLARIS) + #include <poll.h> + #define HAVE_POLL_H + #endif /* SOLARIS */ @@ -1965,7 +1965,7 @@ /*****************************************************************************/ oslSocketAddr SAL_CALL osl_getLocalAddrOfSocket(oslSocket pSocket) |