diff options
| author | mbr <mbr@FreeBSD.org> | 2002-05-31 06:13:07 +0800 |
|---|---|---|
| committer | mbr <mbr@FreeBSD.org> | 2002-05-31 06:13:07 +0800 |
| commit | b0dc7b0376c9b743d5f97251cdfb7819337606a6 (patch) | |
| tree | 3d0ceb7266286167cf570341e7f1910b017d7f82 /editors/openoffice-1.0 | |
| parent | 320f2b0ef8b23efb772377f767d7c3f2128fd655 (diff) | |
| download | freebsd-ports-gnome-b0dc7b0376c9b743d5f97251cdfb7819337606a6.tar.gz freebsd-ports-gnome-b0dc7b0376c9b743d5f97251cdfb7819337606a6.tar.zst freebsd-ports-gnome-b0dc7b0376c9b743d5f97251cdfb7819337606a6.zip | |
Allow uno bridging code to compile with our gcc3.1 and gcc3.2 from ports.
Diffstat (limited to 'editors/openoffice-1.0')
| -rw-r--r-- | editors/openoffice-1.0/files/patch-cppu+inc+uno+lbnames.h | 11 | ||||
| -rw-r--r-- | editors/openoffice-1.0/files/patch-cppu::inc::uno::lbnames.h | 11 |
2 files changed, 22 insertions, 0 deletions
diff --git a/editors/openoffice-1.0/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice-1.0/files/patch-cppu+inc+uno+lbnames.h new file mode 100644 index 000000000000..c972b58f4bb7 --- /dev/null +++ b/editors/openoffice-1.0/files/patch-cppu+inc+uno+lbnames.h @@ -0,0 +1,11 @@ +--- ../cppu/inc/uno/lbnames.h.orig Fri May 31 00:06:58 2002 ++++ ../cppu/inc/uno/lbnames.h Fri May 31 00:07:22 2002 +@@ -94,7 +94,7 @@ + #define __CPPU_ENV gcc2 + #elif (__GNUC__ == 2) + #error "Tested gcc 2 versions are 2.91 and 2.95. Patch uno/lbnames.h to try your gcc 2 version." +-#elif (__GNUC__ == 3 && __GNUC_MINOR__ == 1) ++#elif (__GNUC__ == 3 && (__GNUC_MINOR__ == 0 || __GNUC_MINOR__ == 1 || __GNUC_MINOR__ == 2)) + #define __CPPU_ENV gcc3 + #elif (__GNUC__ == 3) + #error "Tested gcc 3 version is 3.0. Patch uno/lbnames.h to try your gcc 3 version." diff --git a/editors/openoffice-1.0/files/patch-cppu::inc::uno::lbnames.h b/editors/openoffice-1.0/files/patch-cppu::inc::uno::lbnames.h new file mode 100644 index 000000000000..c972b58f4bb7 --- /dev/null +++ b/editors/openoffice-1.0/files/patch-cppu::inc::uno::lbnames.h @@ -0,0 +1,11 @@ +--- ../cppu/inc/uno/lbnames.h.orig Fri May 31 00:06:58 2002 ++++ ../cppu/inc/uno/lbnames.h Fri May 31 00:07:22 2002 +@@ -94,7 +94,7 @@ + #define __CPPU_ENV gcc2 + #elif (__GNUC__ == 2) + #error "Tested gcc 2 versions are 2.91 and 2.95. Patch uno/lbnames.h to try your gcc 2 version." +-#elif (__GNUC__ == 3 && __GNUC_MINOR__ == 1) ++#elif (__GNUC__ == 3 && (__GNUC_MINOR__ == 0 || __GNUC_MINOR__ == 1 || __GNUC_MINOR__ == 2)) + #define __CPPU_ENV gcc3 + #elif (__GNUC__ == 3) + #error "Tested gcc 3 version is 3.0. Patch uno/lbnames.h to try your gcc 3 version." |