diff options
| author | maho <maho@FreeBSD.org> | 2003-08-15 22:37:43 +0000 |
|---|---|---|
| committer | maho <maho@FreeBSD.org> | 2003-08-15 22:37:43 +0000 |
| commit | 42f5e0187a7b021edf040244ca9ca28d6aa54215 (patch) | |
| tree | 41a31019bc4372433641ba1fb50593c66f4773e9 | |
| parent | 1cb0f4aae5b41d5e963375ef308a026e85127879 (diff) | |
| download | FreeBSD-ports-42f5e0187a7b021edf040244ca9ca28d6aa54215.zip FreeBSD-ports-42f5e0187a7b021edf040244ca9ca28d6aa54215.tar.gz | |
/usr/include/sys/resource.h uses `struct timeval` in the definition of
struct rusage. struct timeval is defined in /usr/include/sys/time.h,
but <sys/time.h> is not included in the <sys/resource.h> header file.
Obtained from Volker Quetschke
See http://www.openoffice.org/issues/show_bug.cgi?id=18065 for details.
reviewed: maho (for 4-STABLE and 5-CURRENT)
17 files changed, 187 insertions, 0 deletions
diff --git a/editors/openoffice-1.1-devel/files/patch-vcl+unx+source+app+salmain.cxx b/editors/openoffice-1.1-devel/files/patch-vcl+unx+source+app+salmain.cxx new file mode 100644 index 0000000..8d0a6f4 --- /dev/null +++ b/editors/openoffice-1.1-devel/files/patch-vcl+unx+source+app+salmain.cxx @@ -0,0 +1,11 @@ +--- ../vcl/unx/source/app/salmain.cxx 1 Aug 2003 03:34:39 -0000 1.8.4.1 ++++ ../vcl/unx/source/app/salmain.cxx 7 Aug 2003 22:43:19 -0000 +@@ -62,7 +62,7 @@ + #define _SV_SALMAIN_CXX + + // -=-= #includes =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= +-#ifdef MACOSX ++#if defined(MACOSX) || defined(FREEBSD) + // rlimit needs sys/types.h + #include <sys/types.h> + #include <sys/time.h> diff --git a/editors/openoffice-1.1/files/patch-vcl+unx+source+app+salmain.cxx b/editors/openoffice-1.1/files/patch-vcl+unx+source+app+salmain.cxx new file mode 100644 index 0000000..8d0a6f4 --- /dev/null +++ b/editors/openoffice-1.1/files/patch-vcl+unx+source+app+salmain.cxx @@ -0,0 +1,11 @@ +--- ../vcl/unx/source/app/salmain.cxx 1 Aug 2003 03:34:39 -0000 1.8.4.1 ++++ ../vcl/unx/source/app/salmain.cxx 7 Aug 2003 22:43:19 -0000 +@@ -62,7 +62,7 @@ + #define _SV_SALMAIN_CXX + + // -=-= #includes =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= +-#ifdef MACOSX ++#if defined(MACOSX) || defined(FREEBSD) + // rlimit needs sys/types.h + #include <sys/types.h> + #include <sys/time.h> diff --git a/editors/openoffice-2.0-devel/files/patch-vcl+unx+source+app+salmain.cxx b/editors/openoffice-2.0-devel/files/patch-vcl+unx+source+app+salmain.cxx new file mode 100644 index 0000000..8d0a6f4 --- /dev/null +++ b/editors/openoffice-2.0-devel/files/patch-vcl+unx+source+app+salmain.cxx @@ -0,0 +1,11 @@ +--- ../vcl/unx/source/app/salmain.cxx 1 Aug 2003 03:34:39 -0000 1.8.4.1 ++++ ../vcl/unx/source/app/salmain.cxx 7 Aug 2003 22:43:19 -0000 +@@ -62,7 +62,7 @@ + #define _SV_SALMAIN_CXX + + // -=-= #includes =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= +-#ifdef MACOSX ++#if defined(MACOSX) || defined(FREEBSD) + // rlimit needs sys/types.h + #include <sys/types.h> + #include <sys/time.h> diff --git a/editors/openoffice-3-devel/files/patch-vcl+unx+source+app+salmain.cxx b/editors/openoffice-3-devel/files/patch-vcl+unx+source+app+salmain.cxx new file mode 100644 index 0000000..8d0a6f4 --- /dev/null +++ b/editors/openoffice-3-devel/files/patch-vcl+unx+source+app+salmain.cxx @@ -0,0 +1,11 @@ +--- ../vcl/unx/source/app/salmain.cxx 1 Aug 2003 03:34:39 -0000 1.8.4.1 ++++ ../vcl/unx/source/app/salmain.cxx 7 Aug 2003 22:43:19 -0000 +@@ -62,7 +62,7 @@ + #define _SV_SALMAIN_CXX + + // -=-= #includes =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= +-#ifdef MACOSX ++#if defined(MACOSX) || defined(FREEBSD) + // rlimit needs sys/types.h + #include <sys/types.h> + #include <sys/time.h> diff --git a/editors/openoffice-3/files/patch-vcl+unx+source+app+salmain.cxx b/editors/openoffice-3/files/patch-vcl+unx+source+app+salmain.cxx new file mode 100644 index 0000000..8d0a6f4 --- /dev/null +++ b/editors/openoffice-3/files/patch-vcl+unx+source+app+salmain.cxx @@ -0,0 +1,11 @@ +--- ../vcl/unx/source/app/salmain.cxx 1 Aug 2003 03:34:39 -0000 1.8.4.1 ++++ ../vcl/unx/source/app/salmain.cxx 7 Aug 2003 22:43:19 -0000 +@@ -62,7 +62,7 @@ + #define _SV_SALMAIN_CXX + + // -=-= #includes =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= +-#ifdef MACOSX ++#if defined(MACOSX) || defined(FREEBSD) + // rlimit needs sys/types.h + #include <sys/types.h> + #include <sys/time.h> diff --git a/editors/openoffice-devel/files/patch-vcl+unx+source+app+salmain.cxx b/editors/openoffice-devel/files/patch-vcl+unx+source+app+salmain.cxx new file mode 100644 index 0000000..8d0a6f4 --- /dev/null +++ b/editors/openoffice-devel/files/patch-vcl+unx+source+app+salmain.cxx @@ -0,0 +1,11 @@ +--- ../vcl/unx/source/app/salmain.cxx 1 Aug 2003 03:34:39 -0000 1.8.4.1 ++++ ../vcl/unx/source/app/salmain.cxx 7 Aug 2003 22:43:19 -0000 +@@ -62,7 +62,7 @@ + #define _SV_SALMAIN_CXX + + // -=-= #includes =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= +-#ifdef MACOSX ++#if defined(MACOSX) || defined(FREEBSD) + // rlimit needs sys/types.h + #include <sys/types.h> + #include <sys/time.h> diff --git a/editors/openoffice.org-1.1-devel/files/patch-vcl+unx+source+app+salmain.cxx b/editors/openoffice.org-1.1-devel/files/patch-vcl+unx+source+app+salmain.cxx new file mode 100644 index 0000000..8d0a6f4 --- /dev/null +++ b/editors/openoffice.org-1.1-devel/files/patch-vcl+unx+source+app+salmain.cxx @@ -0,0 +1,11 @@ +--- ../vcl/unx/source/app/salmain.cxx 1 Aug 2003 03:34:39 -0000 1.8.4.1 ++++ ../vcl/unx/source/app/salmain.cxx 7 Aug 2003 22:43:19 -0000 +@@ -62,7 +62,7 @@ + #define _SV_SALMAIN_CXX + + // -=-= #includes =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= +-#ifdef MACOSX ++#if defined(MACOSX) || defined(FREEBSD) + // rlimit needs sys/types.h + #include <sys/types.h> + #include <sys/time.h> diff --git a/editors/openoffice.org-1.1/files/patch-vcl+unx+source+app+salmain.cxx b/editors/openoffice.org-1.1/files/patch-vcl+unx+source+app+salmain.cxx new file mode 100644 index 0000000..8d0a6f4 --- /dev/null +++ b/editors/openoffice.org-1.1/files/patch-vcl+unx+source+app+salmain.cxx @@ -0,0 +1,11 @@ +--- ../vcl/unx/source/app/salmain.cxx 1 Aug 2003 03:34:39 -0000 1.8.4.1 ++++ ../vcl/unx/source/app/salmain.cxx 7 Aug 2003 22:43:19 -0000 +@@ -62,7 +62,7 @@ + #define _SV_SALMAIN_CXX + + // -=-= #includes =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= +-#ifdef MACOSX ++#if defined(MACOSX) || defined(FREEBSD) + // rlimit needs sys/types.h + #include <sys/types.h> + #include <sys/time.h> diff --git a/editors/openoffice.org-2-RC/files/patch-vcl+unx+source+app+salmain.cxx b/editors/openoffice.org-2-RC/files/patch-vcl+unx+source+app+salmain.cxx new file mode 100644 index 0000000..8d0a6f4 --- /dev/null +++ b/editors/openoffice.org-2-RC/files/patch-vcl+unx+source+app+salmain.cxx @@ -0,0 +1,11 @@ +--- ../vcl/unx/source/app/salmain.cxx 1 Aug 2003 03:34:39 -0000 1.8.4.1 ++++ ../vcl/unx/source/app/salmain.cxx 7 Aug 2003 22:43:19 -0000 +@@ -62,7 +62,7 @@ + #define _SV_SALMAIN_CXX + + // -=-= #includes =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= +-#ifdef MACOSX ++#if defined(MACOSX) || defined(FREEBSD) + // rlimit needs sys/types.h + #include <sys/types.h> + #include <sys/time.h> diff --git a/editors/openoffice.org-2-devel/files/patch-vcl+unx+source+app+salmain.cxx b/editors/openoffice.org-2-devel/files/patch-vcl+unx+source+app+salmain.cxx new file mode 100644 index 0000000..8d0a6f4 --- /dev/null +++ b/editors/openoffice.org-2-devel/files/patch-vcl+unx+source+app+salmain.cxx @@ -0,0 +1,11 @@ +--- ../vcl/unx/source/app/salmain.cxx 1 Aug 2003 03:34:39 -0000 1.8.4.1 ++++ ../vcl/unx/source/app/salmain.cxx 7 Aug 2003 22:43:19 -0000 +@@ -62,7 +62,7 @@ + #define _SV_SALMAIN_CXX + + // -=-= #includes =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= +-#ifdef MACOSX ++#if defined(MACOSX) || defined(FREEBSD) + // rlimit needs sys/types.h + #include <sys/types.h> + #include <sys/time.h> diff --git a/editors/openoffice.org-2.0-devel/files/patch-vcl+unx+source+app+salmain.cxx b/editors/openoffice.org-2.0-devel/files/patch-vcl+unx+source+app+salmain.cxx new file mode 100644 index 0000000..8d0a6f4 --- /dev/null +++ b/editors/openoffice.org-2.0-devel/files/patch-vcl+unx+source+app+salmain.cxx @@ -0,0 +1,11 @@ +--- ../vcl/unx/source/app/salmain.cxx 1 Aug 2003 03:34:39 -0000 1.8.4.1 ++++ ../vcl/unx/source/app/salmain.cxx 7 Aug 2003 22:43:19 -0000 +@@ -62,7 +62,7 @@ + #define _SV_SALMAIN_CXX + + // -=-= #includes =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= +-#ifdef MACOSX ++#if defined(MACOSX) || defined(FREEBSD) + // rlimit needs sys/types.h + #include <sys/types.h> + #include <sys/time.h> diff --git a/editors/openoffice.org-2.0/files/patch-vcl+unx+source+app+salmain.cxx b/editors/openoffice.org-2.0/files/patch-vcl+unx+source+app+salmain.cxx new file mode 100644 index 0000000..8d0a6f4 --- /dev/null +++ b/editors/openoffice.org-2.0/files/patch-vcl+unx+source+app+salmain.cxx @@ -0,0 +1,11 @@ +--- ../vcl/unx/source/app/salmain.cxx 1 Aug 2003 03:34:39 -0000 1.8.4.1 ++++ ../vcl/unx/source/app/salmain.cxx 7 Aug 2003 22:43:19 -0000 +@@ -62,7 +62,7 @@ + #define _SV_SALMAIN_CXX + + // -=-= #includes =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= +-#ifdef MACOSX ++#if defined(MACOSX) || defined(FREEBSD) + // rlimit needs sys/types.h + #include <sys/types.h> + #include <sys/time.h> diff --git a/editors/openoffice.org-2/files/patch-vcl+unx+source+app+salmain.cxx b/editors/openoffice.org-2/files/patch-vcl+unx+source+app+salmain.cxx new file mode 100644 index 0000000..8d0a6f4 --- /dev/null +++ b/editors/openoffice.org-2/files/patch-vcl+unx+source+app+salmain.cxx @@ -0,0 +1,11 @@ +--- ../vcl/unx/source/app/salmain.cxx 1 Aug 2003 03:34:39 -0000 1.8.4.1 ++++ ../vcl/unx/source/app/salmain.cxx 7 Aug 2003 22:43:19 -0000 +@@ -62,7 +62,7 @@ + #define _SV_SALMAIN_CXX + + // -=-= #includes =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= +-#ifdef MACOSX ++#if defined(MACOSX) || defined(FREEBSD) + // rlimit needs sys/types.h + #include <sys/types.h> + #include <sys/time.h> diff --git a/editors/openoffice.org-3-RC/files/patch-vcl+unx+source+app+salmain.cxx b/editors/openoffice.org-3-RC/files/patch-vcl+unx+source+app+salmain.cxx new file mode 100644 index 0000000..8d0a6f4 --- /dev/null +++ b/editors/openoffice.org-3-RC/files/patch-vcl+unx+source+app+salmain.cxx @@ -0,0 +1,11 @@ +--- ../vcl/unx/source/app/salmain.cxx 1 Aug 2003 03:34:39 -0000 1.8.4.1 ++++ ../vcl/unx/source/app/salmain.cxx 7 Aug 2003 22:43:19 -0000 +@@ -62,7 +62,7 @@ + #define _SV_SALMAIN_CXX + + // -=-= #includes =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= +-#ifdef MACOSX ++#if defined(MACOSX) || defined(FREEBSD) + // rlimit needs sys/types.h + #include <sys/types.h> + #include <sys/time.h> diff --git a/editors/openoffice.org-3-devel/files/patch-vcl+unx+source+app+salmain.cxx b/editors/openoffice.org-3-devel/files/patch-vcl+unx+source+app+salmain.cxx new file mode 100644 index 0000000..8d0a6f4 --- /dev/null +++ b/editors/openoffice.org-3-devel/files/patch-vcl+unx+source+app+salmain.cxx @@ -0,0 +1,11 @@ +--- ../vcl/unx/source/app/salmain.cxx 1 Aug 2003 03:34:39 -0000 1.8.4.1 ++++ ../vcl/unx/source/app/salmain.cxx 7 Aug 2003 22:43:19 -0000 +@@ -62,7 +62,7 @@ + #define _SV_SALMAIN_CXX + + // -=-= #includes =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= +-#ifdef MACOSX ++#if defined(MACOSX) || defined(FREEBSD) + // rlimit needs sys/types.h + #include <sys/types.h> + #include <sys/time.h> diff --git a/editors/openoffice.org-3/files/patch-vcl+unx+source+app+salmain.cxx b/editors/openoffice.org-3/files/patch-vcl+unx+source+app+salmain.cxx new file mode 100644 index 0000000..8d0a6f4 --- /dev/null +++ b/editors/openoffice.org-3/files/patch-vcl+unx+source+app+salmain.cxx @@ -0,0 +1,11 @@ +--- ../vcl/unx/source/app/salmain.cxx 1 Aug 2003 03:34:39 -0000 1.8.4.1 ++++ ../vcl/unx/source/app/salmain.cxx 7 Aug 2003 22:43:19 -0000 +@@ -62,7 +62,7 @@ + #define _SV_SALMAIN_CXX + + // -=-= #includes =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= +-#ifdef MACOSX ++#if defined(MACOSX) || defined(FREEBSD) + // rlimit needs sys/types.h + #include <sys/types.h> + #include <sys/time.h> diff --git a/editors/openoffice.org-vcltesttool/files/patch-vcl+unx+source+app+salmain.cxx b/editors/openoffice.org-vcltesttool/files/patch-vcl+unx+source+app+salmain.cxx new file mode 100644 index 0000000..8d0a6f4 --- /dev/null +++ b/editors/openoffice.org-vcltesttool/files/patch-vcl+unx+source+app+salmain.cxx @@ -0,0 +1,11 @@ +--- ../vcl/unx/source/app/salmain.cxx 1 Aug 2003 03:34:39 -0000 1.8.4.1 ++++ ../vcl/unx/source/app/salmain.cxx 7 Aug 2003 22:43:19 -0000 +@@ -62,7 +62,7 @@ + #define _SV_SALMAIN_CXX + + // -=-= #includes =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= +-#ifdef MACOSX ++#if defined(MACOSX) || defined(FREEBSD) + // rlimit needs sys/types.h + #include <sys/types.h> + #include <sys/time.h> |
