diff options
author | Martin Blapp <mbr@FreeBSD.org> | 2002-05-30 22:13:07 +0000 |
---|---|---|
committer | Martin Blapp <mbr@FreeBSD.org> | 2002-05-30 22:13:07 +0000 |
commit | f60670bf155caa87c69f590233925540b6233458 (patch) | |
tree | 98dafe0b2ac4fdf5c442a338f581728623abaeb2 /editors/openoffice.org-2 | |
parent | Update to 1.0.18. (diff) |
Allow uno bridging code to compile with our gcc3.1 and gcc3.2 from ports.
Notes
Notes:
svn path=/head/; revision=60320
Diffstat (limited to 'editors/openoffice.org-2')
-rw-r--r-- | editors/openoffice.org-2/files/patch-cppu+inc+uno+lbnames.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/editors/openoffice.org-2/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice.org-2/files/patch-cppu+inc+uno+lbnames.h new file mode 100644 index 000000000000..c972b58f4bb7 --- /dev/null +++ b/editors/openoffice.org-2/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." |