diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-02-25 14:58:41 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-02-25 14:58:41 +0000 |
| commit | eb6dd08b3fb6e68e682a2ffccab13e1713e53c0e (patch) | |
| tree | f436b0647090e54e31c5ece31a1e5c5cacc04146 /tools | |
| parent | 93d13297621ecf7b965a72c7f1abd317fb054051 (diff) | |
INTEGRATION: CWS supdremove02 (1.5.34); FILE MERGED
2008/01/28 12:17:05 rt 1.5.34.1: #i85482# Remove UPD from library name
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/inc/tools/solar.h | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/tools/inc/tools/solar.h b/tools/inc/tools/solar.h index e43634426a49..19b4796c00b7 100644 --- a/tools/inc/tools/solar.h +++ b/tools/inc/tools/solar.h @@ -4,9 +4,9 @@ * * $RCSfile: solar.h,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: hr $ $Date: 2007-11-02 13:00:07 $ + * last change: $Author: obo $ $Date: 2008-02-25 15:58:41 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -424,7 +424,6 @@ template<typename T> inline T Abs(T a) { return (a>=0?a:-a); } #define LIBRARY_STR(s) # s #define LIBRARY_STRING(s) LIBRARY_STR(s) -#define LIBRARY_SOLARUPD() LIBRARY_STRING(SUPD) #define GETFUNCTION( s ) GetFunction( s ) #define LIBRARY_CONCAT3( s1, s2, s3 ) \ @@ -434,30 +433,30 @@ template<typename T> inline T Abs(T a) { return (a>=0?a:-a); } #if defined WIN || defined WNT || defined OS2 #define SVLIBRARY( Base ) \ - LIBRARY_CONCAT4( Base, LIBRARY_SOLARUPD(), __DLLEXTENSION, ".DLL" ) + LIBRARY_CONCAT3( Base, __DLLEXTENSION, ".DLL" ) #define SVLIBRARYLANG( Base, Lang ) \ - LIBRARY_CONCAT4( Base, LIBRARY_SOLARUPD(), Lang, ".DLL" ) + LIBRARY_CONCAT3( Base, Lang, ".DLL" ) #elif defined UNX #define SVLIBRARY( Base ) \ - LIBRARY_CONCAT4( "lib", Base, LIBRARY_SOLARUPD(), __DLLEXTENSION ) + LIBRARY_CONCAT3( "lib", Base, __DLLEXTENSION ) #define SVLIBRARYLANG( Base, Lang ) \ - LIBRARY_CONCAT4( "lib", Base, LIBRARY_SOLARUPD(), Lang ) + LIBRARY_CONCAT3( "lib", Base, Lang ) #else #define SVLIBRARY( Base ) \ - LIBRARY_CONCAT3( Base, LIBRARY_SOLARUPD(), __DLLEXTENSION ) + LIBRARY_CONCAT2( Base, __DLLEXTENSION ) #define SVLIBRARYLANG( Base, Lang ) \ - LIBRARY_CONCAT3( Base, LIBRARY_SOLARUPD(), Lang ) + LIBRARY_CONCAT2( Base, Lang ) #endif #if defined MACOSX #define SV_LIBFILENAME(str) \ - LIBRARYFILENAME_CONCAT3( str, LIBRARY_SOLARUPD(), __DLLEXTENSION ) + LIBRARYFILENAME_CONCAT2( str, __DLLEXTENSION ) #elif defined UNX #define SV_LIBFILENAME(str) \ - LIBRARYFILENAME_CONCAT3( str, LIBRARY_SOLARUPD(), __DLLEXTENSION ) + LIBRARYFILENAME_CONCAT2( str, __DLLEXTENSION ) #else #define SV_LIBFILENAME(str) \ - LIBRARYFILENAME_CONCAT4( str, LIBRARY_SOLARUPD(), __DLLEXTENSION, ".dll" ) + LIBRARYFILENAME_CONCAT3( str, __DLLEXTENSION, ".dll" ) #endif #endif /* _SOLAR_H */ |