[Libreoffice-commits] .: extensions/source

[Fridrich Strba]

 extensions/source/config/ldap/wrapldapinclude.hxx |   15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

New commits:
commit b79115518b9d68cf280cde717634e6f2f2e4ee72
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Wed Jul 18 12:54:18 2012 +0200

    simplify the header a bit
    
    Change-Id: If04e415b043c822d082e8e0889f162db3ed1849e

diff --git a/extensions/source/config/ldap/wrapldapinclude.hxx b/extensions/source/config/ldap/wrapldapinclude.hxx
index 7b03fcd..fe2c7ea 100644
--- a/extensions/source/config/ldap/wrapldapinclude.hxx
+++ b/extensions/source/config/ldap/wrapldapinclude.hxx
@@ -26,6 +26,11 @@
 #include <windows.h>
 #include <winldap.h>
 #define CONST_PCHAR_CAST (const PCHAR)
+#else // !defined WNT
+#include <ldap.h>
+#define CONST_PCHAR_CAST
+#endif // WNT
+
 #ifndef LDAP_API
 #    define LDAP_API(rt) rt
 #endif
@@ -35,16 +40,6 @@
 #ifndef LDAP_NO_ATTRS
 #    define LDAP_NO_ATTRS "1.1"
 #endif
-#else // !defined WNT
-#include <ldap.h>
-#ifndef LDAP_API
-#    define LDAP_API(rt) rt
-#endif
-#ifndef LDAP_CALL
-#    define LDAP_CALL
-#endif
-#define CONST_PCHAR_CAST
-#endif // WNT
 
 #ifdef WNT
 #pragma warning (pop)