diff options
author | Herbert Dürr <hdu@apache.org> | 2011-10-24 11:16:59 +0000 |
---|---|---|
committer | Herbert Dürr <hdu@apache.org> | 2011-10-24 11:16:59 +0000 |
commit | 360f7a6f899d777f884990e3fab93c7da5d36f3c (patch) | |
tree | d41326ad9e846cdc88976a0c12e56a1dc4b26126 /tools/inc | |
parent | 011dd73794e28949053a9f4cd2d1039157007326 (diff) |
(author=ariel) tools/solar.h DLLPOSTFIX clean-up
Author: Ariel Constenla-Haile <ariel.constenla.haile@gmail.com>
Loading libraries is broken in code that uses the macro SVLIBRARY
defined in tools/inc/tools/solar.h, the __DLLEXTENSION macro defined in
that file uses the dll postfixes that where recently removed.
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/tools/inc/tools/solar.h?view=markup#l342
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/tools/inc/tools/solar.h?view=markup#l243
An example in GetSpecialCharsForEdit from sfx2/source/appl/appinit.cxx
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sfx2/source/appl/appinit.cxx?view=markup#l205
* open a Writer document
* open the Find & Replace dialog
* right click on an edit field
* select "Special Character" from the context menu
* the cui library cannot be loaded
attached patch removes all DLLPOSTFIXes, except the one from WIN when
compiled with mingw, this postfix wasn't removed in
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/inc/wntgcci.mk?view=markup#l185
Diffstat (limited to 'tools/inc')
-rw-r--r-- | tools/inc/tools/solar.h | 71 |
1 files changed, 13 insertions, 58 deletions
diff --git a/tools/inc/tools/solar.h b/tools/inc/tools/solar.h index 1686e82bf52d..14da22a094ab 100644 --- a/tools/inc/tools/solar.h +++ b/tools/inc/tools/solar.h @@ -246,67 +246,22 @@ template<typename T> inline T Abs(T a) { return (a>=0?a:-a); } #if defined(__MINGW32__) #define __DLLEXTENSION "gi" #else - #define __DLLEXTENSION "mi" + #define __DLLEXTENSION "" #endif #elif defined OS2 - #define __DLLEXTENSION "go" + #define __DLLEXTENSION "" #elif defined UNX -#ifdef AIX - #define __DLLEXTENSION "ap.so" -#elif defined HPUX - #define __DLLEXTENSION "hr.sl" -#elif defined SOLARIS && defined SPARC && defined IS_LP64 - #define __DLLEXTENSION "su.so" -#elif defined SOLARIS && defined SPARC && !defined __GNUC__ - #define __DLLEXTENSION "ss.so" -#elif defined SOLARIS && defined SPARC && defined __GNUC__ - #define __DLLEXTENSION "sogs.so" -#elif defined SOLARIS && defined INTEL && !defined __GNUC__ - #define __DLLEXTENSION "si.so" -#elif defined SOLARIS && defined INTEL && defined __GNUC__ - #define __DLLEXTENSION "sogi.so" -#elif defined SCO - #define __DLLEXTENSION "ci.so" -#elif defined NETBSD && defined X86 - #define __DLLEXTENSION "bi.so" -#elif defined NETBSD && defined ARM32 - #define __DLLEXTENSION "ba.so" -#elif defined NETBSD && defined SPARC - #define __DLLEXTENSION "bs.so" -#elif defined NETBSD && defined POWERPC - #define __DLLEXTENSION "bp.so" -#elif defined LINUX && defined X86 - #define __DLLEXTENSION "li.so" -#elif defined LINUX && defined POWERPC - #define __DLLEXTENSION "lp.so" -#elif defined LINUX && defined S390 - #define __DLLEXTENSION "l3.so" -#elif defined LINUX && defined ARM32 - #define __DLLEXTENSION "lr.so" -#elif defined LINUX && defined SPARC - #define __DLLEXTENSION "ls.so" -#elif defined LINUX && defined __x86_64__ - #define __DLLEXTENSION "lx.so" -#elif defined LINUX && defined MIPS - #define __DLLEXTENSION "lm.so" -#elif defined LINUX && defined IA64 - #define __DLLEXTENSION "la.so" -#elif defined LINUX && defined M68K - #define __DLLEXTENSION "lm.so" -#elif defined LINUX && defined HPPA - #define __DLLEXTENSION "lh.so" -#elif defined LINUX && defined AXP - #define __DLLEXTENSION "ll.so" -#elif defined LINUX - #error unknown plattform -#elif defined FREEBSD && defined X86 - #define __DLLEXTENSION "fi.so" -#elif defined FREEBSD && defined X86_64 - #define __DLLEXTENSION "fx.so" -#elif defined MACOSX && defined POWERPC - #define __DLLEXTENSION "mxp.dylib" -#elif defined MACOSX && defined X86 - #define __DLLEXTENSION "mxi.dylib" +#ifdef HPUX + #define __DLLEXTENSION ".sl" +#elif defined AIX || \ + defined SOLARIS || \ + defined SCO || \ + defined NETBSD || \ + defined LINUX || \ + defined FREEBSD + #define __DLLEXTENSION ".so" +#elif defined MACOSX + #define __DLLEXTENSION ".dylib" #else #define __DLLEXTENSION ".so" #endif |