incubator-ooo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From h..@apache.org
Subject svn commit: r1188107 - /incubator/ooo/trunk/main/tools/inc/tools/solar.h
Date Mon, 24 Oct 2011 12:17:00 GMT
Author: hdu
Date: Mon Oct 24 12:16:59 2011
New Revision: 1188107

URL: http://svn.apache.org/viewvc?rev=1188107&view=rev
Log:
(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

Modified:
    incubator/ooo/trunk/main/tools/inc/tools/solar.h

Modified: incubator/ooo/trunk/main/tools/inc/tools/solar.h
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/tools/inc/tools/solar.h?rev=1188107&r1=1188106&r2=1188107&view=diff
==============================================================================
--- incubator/ooo/trunk/main/tools/inc/tools/solar.h (original)
+++ incubator/ooo/trunk/main/tools/inc/tools/solar.h Mon Oct 24 12:16:59 2011
@@ -246,67 +246,22 @@ template<typename T> inline T Abs(T 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



Mime
View raw message