From 805e1330ad81f8b96098943adc647648ad4a458c Mon Sep 17 00:00:00 2001 From: Daniel Molkentin Date: Fri, 4 Oct 2013 20:29:42 +0200 Subject: [PATCH] Compile with MinGW --- src/mirall/syncjournaldb.cpp | 2 +- src/mirall/syncjournaldb.h | 2 +- src/mirall/syncjournalfilerecord.cpp | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/mirall/syncjournaldb.cpp b/src/mirall/syncjournaldb.cpp index d3c71a531..bd50e7c8d 100644 --- a/src/mirall/syncjournaldb.cpp +++ b/src/mirall/syncjournaldb.cpp @@ -98,7 +98,7 @@ bool SyncJournalDb::checkConnect() return true; } -int64_t SyncJournalDb::getPHash(const QString& file) const +qint64 SyncJournalDb::getPHash(const QString& file) const { QByteArray utf8File = file.toUtf8(); int64_t h; diff --git a/src/mirall/syncjournaldb.h b/src/mirall/syncjournaldb.h index 3da2caf70..1c3594bdd 100644 --- a/src/mirall/syncjournaldb.h +++ b/src/mirall/syncjournaldb.h @@ -35,7 +35,7 @@ public: QSqlDatabase *getDB(){ return &_db; } bool exists(); bool checkConnect(); - int64_t getPHash(const QString& ) const; + qint64 getPHash(const QString& ) const; signals: diff --git a/src/mirall/syncjournalfilerecord.cpp b/src/mirall/syncjournalfilerecord.cpp index 08330f13d..7696f178e 100644 --- a/src/mirall/syncjournalfilerecord.cpp +++ b/src/mirall/syncjournalfilerecord.cpp @@ -13,10 +13,13 @@ #include "syncjournalfilerecord.h" #include "syncfileitem.h" + #include #include -#ifndef _WIN32 +#ifdef Q_OS_WIN +#include +#else #include #endif @@ -39,7 +42,7 @@ SyncJournalFileRecord::SyncJournalFileRecord(const SyncFileItem &item, const QSt // Query the inode: // based on code from csync_vio_local.c (csync_vio_local_stat) -#ifdef _WIN32 +#ifdef Q_OS_WIN /* Get the Windows file id as an inode replacement. */ HANDLE h = CreateFileW( (wchar_t*)localFileName.utf16(), 0, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL+FILE_FLAG_BACKUP_SEMANTICS, NULL );