diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-04-28 15:26:36 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2003-04-28 15:26:36 +0000 |
commit | 68467be45dafaefdfed34ee19d70ab9419d27f05 (patch) | |
tree | 6dce244111690e747953ca196ea926bb6070fdb3 /cppu | |
parent | 5311ead3c2f9fc4cd9fd23ebd0080c7aa0eb481b (diff) |
INTEGRATION: CWS ooo20030412 (1.9.26); FILE MERGED
2003/04/14 15:58:52 mh 1.9.26.1: chg: for gcc 3.3, #i13400#
Diffstat (limited to 'cppu')
-rw-r--r-- | cppu/inc/uno/lbnames.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/cppu/inc/uno/lbnames.h b/cppu/inc/uno/lbnames.h index b4f7ee17abcd..1a0570c07d94 100644 --- a/cppu/inc/uno/lbnames.h +++ b/cppu/inc/uno/lbnames.h @@ -2,9 +2,9 @@ * * $RCSfile: lbnames.h,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: mh $ $Date: 2002-10-02 13:23:16 $ + * last change: $Author: hr $ $Date: 2003-04-28 16:26:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -94,14 +94,10 @@ provoking error here, because PP ignores #error #define TMP_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__ == 0) -#define __CPPU_ENV gcc3 -#elif (__GNUC__ == 3 && __GNUC_MINOR__ == 1) -#define __CPPU_ENV gcc3 -#elif (__GNUC__ == 3 && __GNUC_MINOR__ == 2) +#elif (__GNUC__ == 3 && __GNUC_MINOR__ <= 3) #define __CPPU_ENV gcc3 #elif (__GNUC__ == 3) -#error "Tested gcc 3 version is <= 3.2. Patch uno/lbnames.h to try your gcc 3 version." +#error "Tested gcc 3 version is <= 3.3. Patch uno/lbnames.h to try your gcc 3 version." #else #error "Supported gcc majors are 2 and 3. Unsupported gcc major version." #endif /* defined (__GNUC__) */ |