From 27f67d52c81e2c4aab5e490fed03e436da3190d8 2013-02-13 11:53:51 From: Vitaly Takmazov Date: 2013-02-13 11:53:51 Subject: [PATCH] fix msvc compilation with log4cxx --- diff --git a/src/logging.cpp b/src/logging.cpp index 947eb2bbf00b8a43e5b10a8a4cdec860ed4f8aac..61c584b016285cab37b9f6733665516f78bdd75d 100644 --- a/src/logging.cpp +++ b/src/logging.cpp @@ -147,9 +147,9 @@ static void initLogging(Config *config, std::string key, bool only_create_dir = dirs.push_back(dir); } } +#ifndef WIN32 mode_t old_cmask; // create directories -#ifndef WIN32 old_cmask = umask(0007); #endif diff --git a/src/tests/main.cpp b/src/tests/main.cpp index 218d66fb3d06e820a1faca24f2c34d0f03087316..9847222e277b2783b0cb4ecb842d1b4fb48fd905 100644 --- a/src/tests/main.cpp +++ b/src/tests/main.cpp @@ -19,7 +19,11 @@ int main (int argc, char* argv[]) { #ifdef WITH_LOG4CXX LoggerPtr root = Logger::getRootLogger(); +#ifndef _MSC_VER root->addAppender(new FileAppender(new PatternLayout("%d %-5p %c: %m%n"), "libtransport_test.log", false)); +#else + root->addAppender(new FileAppender(new PatternLayout(L"%d %-5p %c: %m%n"), L"libtransport_test.log", false)); +#endif #endif std::vector testsToRun;