diff options
-rw-r--r-- | connectivity/source/drivers/mork/MNSFolders.cxx | 4 | ||||
-rw-r--r-- | postprocess/Rdb_services.mk | 9 |
2 files changed, 3 insertions, 10 deletions
diff --git a/connectivity/source/drivers/mork/MNSFolders.cxx b/connectivity/source/drivers/mork/MNSFolders.cxx index 0abfad7f8918..1ea558ca12e4 100644 --- a/connectivity/source/drivers/mork/MNSFolders.cxx +++ b/connectivity/source/drivers/mork/MNSFolders.cxx @@ -47,7 +47,7 @@ namespace ::osl::Security aSecurity; OUString aConfigPath; - #if defined(XP_WIN) || defined(MACOSX) + #if defined(WNT) || defined(MACOSX) aSecurity.getConfigDir( aConfigPath ); #else //This is to find the dir under which .mozilla/.thunderbird is created. @@ -69,7 +69,7 @@ namespace // DO NOT CHANGE THE ORDER; ADD ONLY TO THE END static const char* DefaultProductDir[NB_PRODUCTS][NB_CANDIDATES] = { - #if defined(XP_WIN) + #if defined(WNT) { "Mozilla/SeaMonkey/", NULL, NULL, NULL }, { "Mozilla/Firefox/", NULL, NULL, NULL }, { "Thunderbird/", "Mozilla/Thunderbird/", NULL, NULL } diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk index 46e0f31dded0..88b28ddc7518 100644 --- a/postprocess/Rdb_services.mk +++ b/postprocess/Rdb_services.mk @@ -292,17 +292,10 @@ $(eval $(call gb_Rdb_add_components,services,\ ) \ )) -ifeq ($(OS),WNT) - ifneq ($(WITH_MOZAB4WIN),) $(eval $(call gb_Rdb_add_components,services,\ connectivity/source/drivers/mozab/mozab \ )) -else -$(eval $(call gb_Rdb_add_components,services,\ - connectivity/source/drivers/mozab/bootstrap/mozbootstrap \ -)) -endif else @@ -313,7 +306,7 @@ $(eval $(call gb_Rdb_add_components,services,\ )) endif # DESKTOP -endif # WNT +endif # WITH_MOZAB4WIN endif # DBCONNECTIVITY |