diff options
| author | Release Engineers <releng@openoffice.org> | 2009-08-06 07:01:05 +0000 |
|---|---|---|
| committer | Release Engineers <releng@openoffice.org> | 2009-08-06 07:01:05 +0000 |
| commit | e64d8c0b669c52442cedc34a526ce4391827b7df (patch) | |
| tree | d8a82c891d9784ad15dc3868b7cf79990a3bd01f /cppu | |
| parent | 854b9eeffec7681a78b7c6467c02ab5a44a14435 (diff) | |
CWS-TOOLING: integrate CWS jsc320
2009-07-31 11:40:04 +0200 jsc r274518 : #103926# apply patch
2009-07-16 17:17:01 +0200 jsc r274063 : #i103311# check new Solaris compiler version ox5100
2009-07-07 17:20:41 +0200 jsc r273811 : cleanup
2009-07-07 15:21:26 +0200 jsc r273799 : #98322# correct LD_LIBRARY_PATH, sdk/lib dir instead of sdkout/platfrom/lib, all unix excepting mac
2009-07-07 15:07:05 +0200 jsc r273798 : #i98322# correct link
2009-07-07 09:43:57 +0200 jsc r273773 : #i98322# correct link path
2009-07-06 15:49:07 +0200 jsc r273749 : #i98322# correct typo
2009-07-06 14:17:27 +0200 jsc r273743 : #i103311# support sunstudio compiler 12u1, version 5.10 (which results in 0x5100)
2009-07-03 13:54:58 +0200 jsc r273693 : #i96576# support opensolaris and enhance docu to relfect usage of gmake
2009-07-02 13:12:02 +0200 jsc r273643 : #i103260# improve fix by using EXECPOST variable
2009-07-02 13:11:30 +0200 jsc r273642 : #i103260# improve fix by using EXECPOST variable
2009-07-02 13:05:35 +0200 jsc r273640 : #i103260# correct typo for windows
2009-07-02 13:01:34 +0200 jsc r273639 : #i103260# provide regview with path as argument
2009-07-01 07:18:01 +0200 jsc r273541 : CWS-TOOLING: rebase CWS jsc320 to trunk@273468 (milestone: DEV300:m51)
2009-06-30 08:01:13 +0200 jsc r273485 : #98322# include import purpenvhelper lib under windows
2009-06-10 15:07:29 +0200 jsc r272815 : CWS-TOOLING: rebase CWS jsc320 to trunk@272291 (milestone: DEV300:m49)
2009-05-27 09:36:23 +0200 jsc r272329 : #i98322# create link for purpenvhelper library in SDK
2009-05-27 09:35:41 +0200 jsc r272328 : #i98322# create link for purpenvhelpr library in SDK
2009-05-14 16:19:41 +0200 jsc r271900 : increase version number in SDK header image
2009-05-14 16:11:05 +0200 jsc r271899 : #i101408# new version 3.2
2009-05-14 15:33:47 +0200 jsc r271894 : #i99163# apply patch to correct wrong tags for autodoc
2009-05-14 14:49:58 +0200 jsc r271889 : #i99707# apply patch to remove unused code
Diffstat (limited to 'cppu')
| -rw-r--r-- | cppu/inc/uno/lbnames.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/cppu/inc/uno/lbnames.h b/cppu/inc/uno/lbnames.h index 27a6f1094a0a..481180fda953 100644 --- a/cppu/inc/uno/lbnames.h +++ b/cppu/inc/uno/lbnames.h @@ -46,12 +46,9 @@ #endif /* (_MSC_VER < 1000) */ /* sunpro cc */ #elif defined (__SUNPRO_CC) -#if (__SUNPRO_CC < 0x500) -#error "sunpro cc must be at least 5.x" -provoking error here, because PP ignores #error -#elif (__SUNPRO_CC < 0x600) +#if ((__SUNPRO_CC >= 0x5000 && __SUNPRO_CC < 0x6000) || (__SUNPRO_CC >= 0x500 && __SUNPRO_CC < 0x600)) #define TMP_CPPU_ENV sunpro5 -#else +#elif #error "sunpro cc version must be 5.x" provoking error here, because PP ignores #error #endif /* defined (__SUNPRO_CC) */ |