[Libreoffice-commits] .: 2 commits - tools/inc

[Tor Lillqvist]

 tools/inc/tools/solar.h |   58 +++++++-----------------------------------------
 1 file changed, 9 insertions(+), 49 deletions(-)

New commits:
commit 34cd5cebeeb1ea2f4c1e0c9b18b22da0013f1b01
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Jan 19 14:05:27 2011 +0200

    Delete apparently unused SYSTEM_* definitions

diff --git a/tools/inc/tools/solar.h b/tools/inc/tools/solar.h
index fb2f2ad..4d8d087 100644
--- a/tools/inc/tools/solar.h
+++ b/tools/inc/tools/solar.h
@@ -271,46 +271,6 @@ template<typename T> inline T Abs(T a) { return (a>=0?a:-a); }
 
 /* dll file extensions *******************************************************/
 
-/* many of these platforms are historic */
-#define SYSTEM_WINMSCI		 1
-#define SYSTEM_WNTMSCI		 2
-#define SYSTEM_WNTMSCA		 3
-#define SYSTEM_WNTMSCP		 4
-#define SYSTEM_WNTMSCM		 5
-#define SYSTEM_OS2BLCI		 6
-#define SYSTEM_OS2ICCI		 7
-#define SYSTEM_OS2ICCI3 	 8
-#define SYSTEM_UNXLNXI		 9
-#define SYSTEM_UNXSOLS		10
-#define SYSTEM_UNXBSDI		11
-#define SYSTEM_UNXBSDA		12
-#define SYSTEM_UNXSCOI		13
-#define SYSTEM_UNXAIXP		14
-#define SYSTEM_UNXHPXR		15
-#define SYSTEM_UNXSNIM		16
-#define SYSTEM_UNXMVSG		17
-#define SYSTEM_UNXIRXM		18
-// #define SYSTEM_MACOSP		19
-#define SYSTEM_UNXFBSDI 	20
-#define SYSTEM_UNXSOLI		21
-#define SYSTEM_WINBLCI		22
-#define SYSTEM_UNXMACXP 	23
-#define SYSTEM_UNXLNXP		24
-#define SYSTEM_UNXBSDS		25
-#define SYSTEM_UNXLNXR		26
-#define SYSTEM_UNXLNX3		28
-#define SYSTEM_UNXLNXS		29
-#define SYSTEM_UNXLNXX		30
-#define SYSTEM_UNXSOGS		31
-#define SYSTEM_UNXSOGI		32
-#define SYSTEM_UNXMACXI		33
-#define SYSTEM_OS2GCCI		34
-#define SYSTEM_UNXBSDX		35
-#define SYSTEM_UNXOBSD		36
-#define SYSTEM_WNTGCCI      37
-#define SYSTEM_WNTMSCX      38
-#define SYSTEM_WNTGCCX      39
-
 #if defined WNT && defined __MINGW32__ && defined INTEL
   #define __DLLEXTENSION "gi"
 #elif defined WNT && defined __MINGW32__ && defined X86_64
commit f3b48715518579876c6ab711aa5362d6cd45a604
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Wed Jan 19 12:06:28 2011 +0200

    Add SYSTEM_* and __DLLEXTENSION values for WNT && X86_64

diff --git a/tools/inc/tools/solar.h b/tools/inc/tools/solar.h
index cc78aa5..fb2f2ad 100644
--- a/tools/inc/tools/solar.h
+++ b/tools/inc/tools/solar.h
@@ -307,18 +307,21 @@ template<typename T> inline T Abs(T a) { return (a>=0?a:-a); }
 #define SYSTEM_OS2GCCI		34
 #define SYSTEM_UNXBSDX		35
 #define SYSTEM_UNXOBSD		36
-#define SYSTEM_WNTGCCI  	99
-
-#if defined WNT
-#if defined(__MINGW32__)
-  #define __DLLEXTENSION    "gi"
-#else
+#define SYSTEM_WNTGCCI      37
+#define SYSTEM_WNTMSCX      38
+#define SYSTEM_WNTGCCX      39
+
+#if defined WNT && defined __MINGW32__ && defined INTEL
+  #define __DLLEXTENSION "gi"
+#elif defined WNT && defined __MINGW32__ && defined X86_64
+  #define __DLLEXTENSION "gx"
+#elif defined WNT && defined _MSC_VER && defined INTEL
   #define __DLLEXTENSION "mi"
-#endif
+#elif defined WNT && defined _MSC_VER && defined X86_64
+  #define __DLLEXTENSION "mx"
 #elif defined OS2
   #define __DLLEXTENSION "go"
-#elif defined UNX
-#ifdef AIX
+#elif defined AIX
   #define __DLLEXTENSION "ap.so"
 #elif defined HPUX
   #define __DLLEXTENSION "hr.sl"
@@ -366,8 +369,6 @@ template<typename T> inline T Abs(T a) { return (a>=0?a:-a); }
   #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
@@ -379,8 +380,7 @@ template<typename T> inline T Abs(T a) { return (a>=0?a:-a); }
 #elif defined OPENBSD
   #define __DLLEXTENSION "ob.so"
 #else
-  #define __DLLEXTENSION ".so"
-#endif
+  #error unknown plattform
 #endif
 
 // -----------------------------------------------------------------------