From 57b76bd76f6d076cf30b3e926811e28220bbbd45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20P=FCtter?= Date: Mon, 20 Feb 2012 13:11:34 +0100 Subject: [PATCH] fix oidentconfigger build under windows --- src/core/oidentdconfiggenerator.cpp | 8 +++++++- src/core/oidentdconfiggenerator.h | 8 +++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/core/oidentdconfiggenerator.cpp b/src/core/oidentdconfiggenerator.cpp index fac6dcd..c7c4700 100644 --- a/src/core/oidentdconfiggenerator.cpp +++ b/src/core/oidentdconfiggenerator.cpp @@ -17,7 +17,6 @@ * Free Software Foundation, Inc., * * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ - #include "oidentdconfiggenerator.h" OidentdConfigGenerator::OidentdConfigGenerator(QObject *parent) : @@ -103,9 +102,16 @@ bool OidentdConfigGenerator::parseConfig(bool readQuasselStanzas) { } bool OidentdConfigGenerator::writeConfig() { + +#ifndef Q_OS_WIN32 mode_t prev_umask = umask(S_IXUSR | S_IWGRP | S_IXGRP | S_IWOTH | S_IXOTH); // == 0133, rw-r--r-- bool not_open = (!_configFile->isOpen() && !_configFile->open(QIODevice::ReadWrite | QIODevice::Text)); umask(prev_umask); +#else + int prev_umask = _umask(_S_IREAD | _S_IWRITE); + bool not_open = (!_configFile->isOpen() && !_configFile->open(QIODevice::ReadWrite | QIODevice::Text)); + _umask(prev_umask); +#endif /* Q_OS_WIN32 */ if (not_open) return false; diff --git a/src/core/oidentdconfiggenerator.h b/src/core/oidentdconfiggenerator.h index 55c06ca..61be681 100644 --- a/src/core/oidentdconfiggenerator.h +++ b/src/core/oidentdconfiggenerator.h @@ -29,9 +29,11 @@ #include #include -#ifndef Q_OS_WIN32 -# include -# include +//#ifndef Q_OS_WIN32 +#include +#include +#ifdef Q_OS_WIN32 + #include #endif /* Q_OS_WIN32 */ #include "quassel.h" -- 1.7.9.msysgit.0