diff options
| author | Malte Timmermann <Malte.Timmermann@sun.com> | 2010-06-25 13:15:03 +0200 |
|---|---|---|
| committer | Malte Timmermann <Malte.Timmermann@sun.com> | 2010-06-25 13:15:03 +0200 |
| commit | cd0a3434315dd48ac0b351a9f6b40e8e31df0d6c (patch) | |
| tree | d49a0ab3e85484a09806d9cc725f43804cc758fe /extensions | |
| parent | 16ae4c1524769458f6d205430e7dcb8fc4ae333b (diff) | |
codecleanup02: #i112685# Removed ifdefs and code for WIN,W30,W31
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/config/ldap/ldapaccess.cxx | 2 | ||||
| -rw-r--r-- | extensions/source/scanner/scanwin.cxx | 5 | ||||
| -rw-r--r-- | extensions/source/scanner/twain.cxx | 7 |
3 files changed, 4 insertions, 10 deletions
diff --git a/extensions/source/config/ldap/ldapaccess.cxx b/extensions/source/config/ldap/ldapaccess.cxx index c518dc37e94c..99312cdfde23 100644 --- a/extensions/source/config/ldap/ldapaccess.cxx +++ b/extensions/source/config/ldap/ldapaccess.cxx @@ -279,7 +279,7 @@ void LdapConnection::loadModule() { if ( !s_Ldap_Module ) { -#if defined(WIN) || defined(WNT) +#if defined(WNT) # define LIBLDAP "nsldap32v50.dll" #else # ifdef WITH_OPENLDAP diff --git a/extensions/source/scanner/scanwin.cxx b/extensions/source/scanner/scanwin.cxx index e14fffa87d0c..baba37bed954 100644 --- a/extensions/source/scanner/scanwin.cxx +++ b/extensions/source/scanner/scanwin.cxx @@ -74,10 +74,7 @@ using namespace ::com::sun::star; #define FIXTODOUBLE( nFix ) ((double)nFix.Whole+(double)nFix.Frac/65536.) #define FIXTOLONG( nFix ) ((long)floor(FIXTODOUBLE(nFix)+0.5)) -#if defined WIN -#define TWAIN_LIBNAME "TWAIN.DLL" -#define TWAIN_FUNCNAME "DSM_Entry" -#elif defined WNT +#if defined WNT #define TWAIN_LIBNAME "TWAIN_32.DLL" #define TWAIN_FUNCNAME "DSM_Entry" #endif diff --git a/extensions/source/scanner/twain.cxx b/extensions/source/scanner/twain.cxx index b11f2725501e..3e71c5eb3874 100644 --- a/extensions/source/scanner/twain.cxx +++ b/extensions/source/scanner/twain.cxx @@ -31,7 +31,7 @@ #include <string.h> #include <math.h> -#if defined( WNT ) || defined (WIN) +#if defined( WNT ) #include <tools/svwin.h> #endif #ifdef OS2 @@ -52,10 +52,7 @@ #define FIXTODOUBLE( nFix ) ((double)nFix.Whole+(double)nFix.Frac/65536.) #define FIXTOLONG( nFix ) ((long)floor(FIXTODOUBLE(nFix)+0.5)) -#if defined WIN -#define TWAIN_LIBNAME "TWAIN.DLL" -#define TWAIN_FUNCNAME "DSM_Entry" -#elif defined WNT +#if defined WNT #define TWAIN_LIBNAME "TWAIN_32.DLL" #define TWAIN_FUNCNAME "DSM_Entry" #elif defined OS2 |