summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Blapp <mbr@FreeBSD.org>2002-05-30 22:38:37 +0000
committerMartin Blapp <mbr@FreeBSD.org>2002-05-30 22:38:37 +0000
commitb2b0846bf2ed19d08bfdec4c0ab408953d60eb6e (patch)
treeed8da48d012d5ee9980c9944b610eac128c29582
parentOnly poll the CD drive every 10 seconds (instead of every second) to see if (diff)
Fix patch. Of course the original checked for gcc3.0, not gcc3.1
Notes
Notes: svn path=/head/; revision=60326
-rw-r--r--editors/openoffice-1.0/files/patch-cppu+inc+uno+lbnames.h2
-rw-r--r--editors/openoffice-1.0/files/patch-cppu::inc::uno::lbnames.h2
-rw-r--r--editors/openoffice-1.1-devel/files/patch-cppu+inc+uno+lbnames.h2
-rw-r--r--editors/openoffice-1.1/files/patch-cppu+inc+uno+lbnames.h2
-rw-r--r--editors/openoffice-2.0-devel/files/patch-cppu+inc+uno+lbnames.h2
-rw-r--r--editors/openoffice-3-devel/files/patch-cppu+inc+uno+lbnames.h2
-rw-r--r--editors/openoffice-3/files/patch-cppu+inc+uno+lbnames.h2
-rw-r--r--editors/openoffice-devel/files/patch-cppu+inc+uno+lbnames.h2
-rw-r--r--editors/openoffice.org-1.0/files/patch-cppu+inc+uno+lbnames.h2
-rw-r--r--editors/openoffice.org-1.0/files/patch-cppu::inc::uno::lbnames.h2
-rw-r--r--editors/openoffice.org-1.1-devel/files/patch-cppu+inc+uno+lbnames.h2
-rw-r--r--editors/openoffice.org-1.1/files/patch-cppu+inc+uno+lbnames.h2
-rw-r--r--editors/openoffice.org-2-RC/files/patch-cppu+inc+uno+lbnames.h2
-rw-r--r--editors/openoffice.org-2-devel/files/patch-cppu+inc+uno+lbnames.h2
-rw-r--r--editors/openoffice.org-2.0-devel/files/patch-cppu+inc+uno+lbnames.h2
-rw-r--r--editors/openoffice.org-2.0/files/patch-cppu+inc+uno+lbnames.h2
-rw-r--r--editors/openoffice.org-2/files/patch-cppu+inc+uno+lbnames.h2
-rw-r--r--editors/openoffice.org-3-RC/files/patch-cppu+inc+uno+lbnames.h2
-rw-r--r--editors/openoffice.org-3-devel/files/patch-cppu+inc+uno+lbnames.h2
-rw-r--r--editors/openoffice.org-3/files/patch-cppu+inc+uno+lbnames.h2
-rw-r--r--editors/openoffice.org-vcltesttool/files/patch-cppu+inc+uno+lbnames.h2
-rw-r--r--editors/openoffice/files/patch-cppu+inc+uno+lbnames.h2
-rw-r--r--editors/openoffice/files/patch-cppu::inc::uno::lbnames.h2
23 files changed, 23 insertions, 23 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
index c972b58f4bb7..cb43c2d165e9 100644
--- a/editors/openoffice-1.0/files/patch-cppu+inc+uno+lbnames.h
+++ b/editors/openoffice-1.0/files/patch-cppu+inc+uno+lbnames.h
@@ -4,7 +4,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)
+#elif (__GNUC__ == 3 && (__GNUC_MINOR__ == 0 || __GNUC_MINOR__ == 1 || __GNUC_MINOR__ == 2))
#define __CPPU_ENV gcc3
#elif (__GNUC__ == 3)
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
index c972b58f4bb7..cb43c2d165e9 100644
--- a/editors/openoffice-1.0/files/patch-cppu::inc::uno::lbnames.h
+++ b/editors/openoffice-1.0/files/patch-cppu::inc::uno::lbnames.h
@@ -4,7 +4,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)
+#elif (__GNUC__ == 3 && (__GNUC_MINOR__ == 0 || __GNUC_MINOR__ == 1 || __GNUC_MINOR__ == 2))
#define __CPPU_ENV gcc3
#elif (__GNUC__ == 3)
diff --git a/editors/openoffice-1.1-devel/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice-1.1-devel/files/patch-cppu+inc+uno+lbnames.h
index c972b58f4bb7..cb43c2d165e9 100644
--- a/editors/openoffice-1.1-devel/files/patch-cppu+inc+uno+lbnames.h
+++ b/editors/openoffice-1.1-devel/files/patch-cppu+inc+uno+lbnames.h
@@ -4,7 +4,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)
+#elif (__GNUC__ == 3 && (__GNUC_MINOR__ == 0 || __GNUC_MINOR__ == 1 || __GNUC_MINOR__ == 2))
#define __CPPU_ENV gcc3
#elif (__GNUC__ == 3)
diff --git a/editors/openoffice-1.1/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice-1.1/files/patch-cppu+inc+uno+lbnames.h
index c972b58f4bb7..cb43c2d165e9 100644
--- a/editors/openoffice-1.1/files/patch-cppu+inc+uno+lbnames.h
+++ b/editors/openoffice-1.1/files/patch-cppu+inc+uno+lbnames.h
@@ -4,7 +4,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)
+#elif (__GNUC__ == 3 && (__GNUC_MINOR__ == 0 || __GNUC_MINOR__ == 1 || __GNUC_MINOR__ == 2))
#define __CPPU_ENV gcc3
#elif (__GNUC__ == 3)
diff --git a/editors/openoffice-2.0-devel/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice-2.0-devel/files/patch-cppu+inc+uno+lbnames.h
index c972b58f4bb7..cb43c2d165e9 100644
--- a/editors/openoffice-2.0-devel/files/patch-cppu+inc+uno+lbnames.h
+++ b/editors/openoffice-2.0-devel/files/patch-cppu+inc+uno+lbnames.h
@@ -4,7 +4,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)
+#elif (__GNUC__ == 3 && (__GNUC_MINOR__ == 0 || __GNUC_MINOR__ == 1 || __GNUC_MINOR__ == 2))
#define __CPPU_ENV gcc3
#elif (__GNUC__ == 3)
diff --git a/editors/openoffice-3-devel/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice-3-devel/files/patch-cppu+inc+uno+lbnames.h
index c972b58f4bb7..cb43c2d165e9 100644
--- a/editors/openoffice-3-devel/files/patch-cppu+inc+uno+lbnames.h
+++ b/editors/openoffice-3-devel/files/patch-cppu+inc+uno+lbnames.h
@@ -4,7 +4,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)
+#elif (__GNUC__ == 3 && (__GNUC_MINOR__ == 0 || __GNUC_MINOR__ == 1 || __GNUC_MINOR__ == 2))
#define __CPPU_ENV gcc3
#elif (__GNUC__ == 3)
diff --git a/editors/openoffice-3/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice-3/files/patch-cppu+inc+uno+lbnames.h
index c972b58f4bb7..cb43c2d165e9 100644
--- a/editors/openoffice-3/files/patch-cppu+inc+uno+lbnames.h
+++ b/editors/openoffice-3/files/patch-cppu+inc+uno+lbnames.h
@@ -4,7 +4,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)
+#elif (__GNUC__ == 3 && (__GNUC_MINOR__ == 0 || __GNUC_MINOR__ == 1 || __GNUC_MINOR__ == 2))
#define __CPPU_ENV gcc3
#elif (__GNUC__ == 3)
diff --git a/editors/openoffice-devel/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice-devel/files/patch-cppu+inc+uno+lbnames.h
index c972b58f4bb7..cb43c2d165e9 100644
--- a/editors/openoffice-devel/files/patch-cppu+inc+uno+lbnames.h
+++ b/editors/openoffice-devel/files/patch-cppu+inc+uno+lbnames.h
@@ -4,7 +4,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)
+#elif (__GNUC__ == 3 && (__GNUC_MINOR__ == 0 || __GNUC_MINOR__ == 1 || __GNUC_MINOR__ == 2))
#define __CPPU_ENV gcc3
#elif (__GNUC__ == 3)
diff --git a/editors/openoffice.org-1.0/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice.org-1.0/files/patch-cppu+inc+uno+lbnames.h
index c972b58f4bb7..cb43c2d165e9 100644
--- a/editors/openoffice.org-1.0/files/patch-cppu+inc+uno+lbnames.h
+++ b/editors/openoffice.org-1.0/files/patch-cppu+inc+uno+lbnames.h
@@ -4,7 +4,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)
+#elif (__GNUC__ == 3 && (__GNUC_MINOR__ == 0 || __GNUC_MINOR__ == 1 || __GNUC_MINOR__ == 2))
#define __CPPU_ENV gcc3
#elif (__GNUC__ == 3)
diff --git a/editors/openoffice.org-1.0/files/patch-cppu::inc::uno::lbnames.h b/editors/openoffice.org-1.0/files/patch-cppu::inc::uno::lbnames.h
index c972b58f4bb7..cb43c2d165e9 100644
--- a/editors/openoffice.org-1.0/files/patch-cppu::inc::uno::lbnames.h
+++ b/editors/openoffice.org-1.0/files/patch-cppu::inc::uno::lbnames.h
@@ -4,7 +4,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)
+#elif (__GNUC__ == 3 && (__GNUC_MINOR__ == 0 || __GNUC_MINOR__ == 1 || __GNUC_MINOR__ == 2))
#define __CPPU_ENV gcc3
#elif (__GNUC__ == 3)
diff --git a/editors/openoffice.org-1.1-devel/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice.org-1.1-devel/files/patch-cppu+inc+uno+lbnames.h
index c972b58f4bb7..cb43c2d165e9 100644
--- a/editors/openoffice.org-1.1-devel/files/patch-cppu+inc+uno+lbnames.h
+++ b/editors/openoffice.org-1.1-devel/files/patch-cppu+inc+uno+lbnames.h
@@ -4,7 +4,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)
+#elif (__GNUC__ == 3 && (__GNUC_MINOR__ == 0 || __GNUC_MINOR__ == 1 || __GNUC_MINOR__ == 2))
#define __CPPU_ENV gcc3
#elif (__GNUC__ == 3)
diff --git a/editors/openoffice.org-1.1/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice.org-1.1/files/patch-cppu+inc+uno+lbnames.h
index c972b58f4bb7..cb43c2d165e9 100644
--- a/editors/openoffice.org-1.1/files/patch-cppu+inc+uno+lbnames.h
+++ b/editors/openoffice.org-1.1/files/patch-cppu+inc+uno+lbnames.h
@@ -4,7 +4,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)
+#elif (__GNUC__ == 3 && (__GNUC_MINOR__ == 0 || __GNUC_MINOR__ == 1 || __GNUC_MINOR__ == 2))
#define __CPPU_ENV gcc3
#elif (__GNUC__ == 3)
diff --git a/editors/openoffice.org-2-RC/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice.org-2-RC/files/patch-cppu+inc+uno+lbnames.h
index c972b58f4bb7..cb43c2d165e9 100644
--- a/editors/openoffice.org-2-RC/files/patch-cppu+inc+uno+lbnames.h
+++ b/editors/openoffice.org-2-RC/files/patch-cppu+inc+uno+lbnames.h
@@ -4,7 +4,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)
+#elif (__GNUC__ == 3 && (__GNUC_MINOR__ == 0 || __GNUC_MINOR__ == 1 || __GNUC_MINOR__ == 2))
#define __CPPU_ENV gcc3
#elif (__GNUC__ == 3)
diff --git a/editors/openoffice.org-2-devel/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice.org-2-devel/files/patch-cppu+inc+uno+lbnames.h
index c972b58f4bb7..cb43c2d165e9 100644
--- a/editors/openoffice.org-2-devel/files/patch-cppu+inc+uno+lbnames.h
+++ b/editors/openoffice.org-2-devel/files/patch-cppu+inc+uno+lbnames.h
@@ -4,7 +4,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)
+#elif (__GNUC__ == 3 && (__GNUC_MINOR__ == 0 || __GNUC_MINOR__ == 1 || __GNUC_MINOR__ == 2))
#define __CPPU_ENV gcc3
#elif (__GNUC__ == 3)
diff --git a/editors/openoffice.org-2.0-devel/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice.org-2.0-devel/files/patch-cppu+inc+uno+lbnames.h
index c972b58f4bb7..cb43c2d165e9 100644
--- a/editors/openoffice.org-2.0-devel/files/patch-cppu+inc+uno+lbnames.h
+++ b/editors/openoffice.org-2.0-devel/files/patch-cppu+inc+uno+lbnames.h
@@ -4,7 +4,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)
+#elif (__GNUC__ == 3 && (__GNUC_MINOR__ == 0 || __GNUC_MINOR__ == 1 || __GNUC_MINOR__ == 2))
#define __CPPU_ENV gcc3
#elif (__GNUC__ == 3)
diff --git a/editors/openoffice.org-2.0/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice.org-2.0/files/patch-cppu+inc+uno+lbnames.h
index c972b58f4bb7..cb43c2d165e9 100644
--- a/editors/openoffice.org-2.0/files/patch-cppu+inc+uno+lbnames.h
+++ b/editors/openoffice.org-2.0/files/patch-cppu+inc+uno+lbnames.h
@@ -4,7 +4,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)
+#elif (__GNUC__ == 3 && (__GNUC_MINOR__ == 0 || __GNUC_MINOR__ == 1 || __GNUC_MINOR__ == 2))
#define __CPPU_ENV gcc3
#elif (__GNUC__ == 3)
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
index c972b58f4bb7..cb43c2d165e9 100644
--- a/editors/openoffice.org-2/files/patch-cppu+inc+uno+lbnames.h
+++ b/editors/openoffice.org-2/files/patch-cppu+inc+uno+lbnames.h
@@ -4,7 +4,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)
+#elif (__GNUC__ == 3 && (__GNUC_MINOR__ == 0 || __GNUC_MINOR__ == 1 || __GNUC_MINOR__ == 2))
#define __CPPU_ENV gcc3
#elif (__GNUC__ == 3)
diff --git a/editors/openoffice.org-3-RC/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice.org-3-RC/files/patch-cppu+inc+uno+lbnames.h
index c972b58f4bb7..cb43c2d165e9 100644
--- a/editors/openoffice.org-3-RC/files/patch-cppu+inc+uno+lbnames.h
+++ b/editors/openoffice.org-3-RC/files/patch-cppu+inc+uno+lbnames.h
@@ -4,7 +4,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)
+#elif (__GNUC__ == 3 && (__GNUC_MINOR__ == 0 || __GNUC_MINOR__ == 1 || __GNUC_MINOR__ == 2))
#define __CPPU_ENV gcc3
#elif (__GNUC__ == 3)
diff --git a/editors/openoffice.org-3-devel/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice.org-3-devel/files/patch-cppu+inc+uno+lbnames.h
index c972b58f4bb7..cb43c2d165e9 100644
--- a/editors/openoffice.org-3-devel/files/patch-cppu+inc+uno+lbnames.h
+++ b/editors/openoffice.org-3-devel/files/patch-cppu+inc+uno+lbnames.h
@@ -4,7 +4,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)
+#elif (__GNUC__ == 3 && (__GNUC_MINOR__ == 0 || __GNUC_MINOR__ == 1 || __GNUC_MINOR__ == 2))
#define __CPPU_ENV gcc3
#elif (__GNUC__ == 3)
diff --git a/editors/openoffice.org-3/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice.org-3/files/patch-cppu+inc+uno+lbnames.h
index c972b58f4bb7..cb43c2d165e9 100644
--- a/editors/openoffice.org-3/files/patch-cppu+inc+uno+lbnames.h
+++ b/editors/openoffice.org-3/files/patch-cppu+inc+uno+lbnames.h
@@ -4,7 +4,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)
+#elif (__GNUC__ == 3 && (__GNUC_MINOR__ == 0 || __GNUC_MINOR__ == 1 || __GNUC_MINOR__ == 2))
#define __CPPU_ENV gcc3
#elif (__GNUC__ == 3)
diff --git a/editors/openoffice.org-vcltesttool/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice.org-vcltesttool/files/patch-cppu+inc+uno+lbnames.h
index c972b58f4bb7..cb43c2d165e9 100644
--- a/editors/openoffice.org-vcltesttool/files/patch-cppu+inc+uno+lbnames.h
+++ b/editors/openoffice.org-vcltesttool/files/patch-cppu+inc+uno+lbnames.h
@@ -4,7 +4,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)
+#elif (__GNUC__ == 3 && (__GNUC_MINOR__ == 0 || __GNUC_MINOR__ == 1 || __GNUC_MINOR__ == 2))
#define __CPPU_ENV gcc3
#elif (__GNUC__ == 3)
diff --git a/editors/openoffice/files/patch-cppu+inc+uno+lbnames.h b/editors/openoffice/files/patch-cppu+inc+uno+lbnames.h
index c972b58f4bb7..cb43c2d165e9 100644
--- a/editors/openoffice/files/patch-cppu+inc+uno+lbnames.h
+++ b/editors/openoffice/files/patch-cppu+inc+uno+lbnames.h
@@ -4,7 +4,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)
+#elif (__GNUC__ == 3 && (__GNUC_MINOR__ == 0 || __GNUC_MINOR__ == 1 || __GNUC_MINOR__ == 2))
#define __CPPU_ENV gcc3
#elif (__GNUC__ == 3)
diff --git a/editors/openoffice/files/patch-cppu::inc::uno::lbnames.h b/editors/openoffice/files/patch-cppu::inc::uno::lbnames.h
index c972b58f4bb7..cb43c2d165e9 100644
--- a/editors/openoffice/files/patch-cppu::inc::uno::lbnames.h
+++ b/editors/openoffice/files/patch-cppu::inc::uno::lbnames.h
@@ -4,7 +4,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)
+#elif (__GNUC__ == 3 && (__GNUC_MINOR__ == 0 || __GNUC_MINOR__ == 1 || __GNUC_MINOR__ == 2))
#define __CPPU_ENV gcc3
#elif (__GNUC__ == 3)