forked from Lainports/freebsd-ports
Fix patch. Of course the original checked for gcc3.0, not gcc3.1
This commit is contained in:
parent
f5de0fa726
commit
b2b0846bf2
23 changed files with 23 additions and 23 deletions
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue