win32 / SAL_DLLPREFIX ?

[Michael Meeks]

Hi there,

	I wanted to apply the appended to clean some more un-necessary horrors
out of solar.h - it looked (to me) as if SAL_DLLPREFIX is not defined
for windows - and there are a load of nasty conditionals around this
across the place and lots of:

#ifndef SAL_DLLPREFIX
#  define SAL_DLLPREFIX ""
#endif

	Is that deliberate ? :-) it'd be a great easy-hack to clean all of that
up (I guess).

	ATB,

		Michael.

diff --git a/tools/inc/tools/solar.h b/tools/inc/tools/solar.h
index 2712f9c..4109816 100644
--- a/tools/inc/tools/solar.h
+++ b/tools/inc/tools/solar.h
@@ -146,22 +146,10 @@ template<typename T> inline T Abs(T a) { return (a>=0?a:-a); }
 #define XubString       String
 #define xub_StrLen      sal_uInt16
 
-#define STRING_CONCAT3( s1, s2, s3 ) \
-    s1 s2 s3
-
-// dll file extensions
-
-#if defined WNT
-#define SVLIBRARY( Base ) \
-    STRING_CONCAT3( Base, "lo", ".dll" )
-#elif defined MACOSX
-#define SVLIBRARY( Base ) \
-    STRING_CONCAT3( "lib", Base, "lo.dylib" )
-#elif defined UNX
-#define SVLIBRARY( Base ) \
-    STRING_CONCAT3( "lib", Base, "lo.so" )
+#ifdef SAL_DLLPREFIX
+#  define SVLIBRARY( Base ) SAL_DLLPREFIX Base "lo" SAL_DLLEXTENSION
 #else
-  #error unknown platform
+#  define SVLIBRARY( Base ) Base "lo" SAL_DLLEXTENSION
 #endif
 
 #endif

-- 
michael.meeks at suse.com  <><, Pseudo Engineer, itinerant idiot