From 60027f7eac442d7faea6b0106ede1c5c3e3af5f0 Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Mon, 17 Jan 2005 01:22:11 +0000 Subject: [PATCH] Use the standard MIME DB path when running under Haiku, but a different one when running under BeOS (so BeOS' MIME DB is not affected when running tests). git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10784 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/kits/storage/mime/database_support.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/kits/storage/mime/database_support.cpp b/src/kits/storage/mime/database_support.cpp index d583a091c9..1ef90f2ee7 100644 --- a/src/kits/storage/mime/database_support.cpp +++ b/src/kits/storage/mime/database_support.cpp @@ -7,6 +7,7 @@ Private mime database functions and constants */ +#include #include #include #include @@ -37,8 +38,12 @@ namespace BPrivate { namespace Storage { namespace Mime { -//const std::string kDatabaseDir = "/boot/home/config/settings/beos_mime"; -const std::string kDatabaseDir = "/boot/home/config/settings/obos_mime"; +static const char *sHaikuDBDir = "/boot/home/config/settings/beos_mime"; + // when running natively under Haiku +static const char *sBeOSDBDir = "/boot/home/config/settings/obos_mime"; + // when running under BeOS +const std::string kDatabaseDir + = (is_running_on_haiku() ? sHaikuDBDir : sBeOSDBDir); const std::string kApplicationDatabaseDir = kDatabaseDir + "/application"; #define ATTR_PREFIX "META:"