[Libreoffice-commits] .: dbaccess/Library_dbu.mk dbaccess/source

[Tor Lillqvist]

 dbaccess/Library_dbu.mk                     |    2 --
 dbaccess/source/ui/dlg/ConnectionHelper.cxx |    3 ---
 2 files changed, 5 deletions(-)

New commits:
commit ab580c7a586ef92a46a8489428671481b17521d9
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Mon May 16 15:57:17 2011 +0300

    We always use a Vista or newer SDK

diff --git a/dbaccess/Library_dbu.mk b/dbaccess/Library_dbu.mk
index 08e2351..68472cd 100644
--- a/dbaccess/Library_dbu.mk
+++ b/dbaccess/Library_dbu.mk
@@ -46,14 +46,12 @@ $(eval $(call gb_Library_set_defs,dbu,\
     $(if $(filter YES,$(SYSTEM_ODBC_HEADERS)),-DSYSTEM_ODBC_HEADERS) \
 ))
 
-ifneq (,$(strip $(WINDOWS_VISTA_PSDK)))
 ifeq (,$(strip $(PROF_EDITION)))
 $(eval $(call gb_Library_set_defs,dbu,\
     $$(DEFS) \
     -DWINDOWS_VISTA_PSDK \
 ))
 endif
-endif
 
 ifeq ($(GUI)$(COM),WNTGCC) # for adoint.h
 $(eval $(call gb_Library_set_cflags,dbu,\
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index 3b70cbe..8c0d2c3 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -70,9 +70,6 @@
 #include <tools/urlobj.hxx>
 #include <tools/diagnose_ex.h>
 #include <sfx2/docfilt.hxx>
-#if !defined(WINDOWS_VISTA_PSDK) && defined(WNT)
-#define _ADO_DATALINK_BROWSE_
-#endif
 
 #ifdef _ADO_DATALINK_BROWSE_
 #include <vcl/sysdata.hxx>