# HG changeset patch # User Hasan Yavuz ÖZDERYA # Date 2018-03-26 15:04:34 # Node ID be51880992908ce51786c6bb12d92e427cbcc93b # Parent a7301e1282b48a759645f73237e6b7fba8618933 fix windows build error due to conflicting "i386" definitions diff --git a/src/updatechecker.cpp b/src/updatechecker.cpp --- a/src/updatechecker.cpp +++ b/src/updatechecker.cpp @@ -1,5 +1,5 @@ /* - Copyright © 2017 Hasan Yavuz Özderya + Copyright © 2018 Hasan Yavuz Özderya This file is part of serialplot. @@ -155,7 +155,7 @@ bool UpdateChecker::parseData(const QJso else if (finfo.name.contains("win32") || finfo.name.contains("i386")) { - finfo.arch = FileArch::i386; + finfo.arch = FileArch::_i386; } else { @@ -186,7 +186,7 @@ bool UpdateChecker::findUpdate(const QLi #if defined(Q_PROCESSOR_X86_64) const FileArch arch = FileArch::amd64; #elif defined(Q_PROCESSOR_X86_32) - const FileArch arch = FileArch::i386; + const FileArch arch = FileArch::_i386; #elif defined(Q_PROCESSOR_ARM) const FileArch arch = FileArch::arm; #else diff --git a/src/updatechecker.h b/src/updatechecker.h --- a/src/updatechecker.h +++ b/src/updatechecker.h @@ -1,5 +1,5 @@ /* - Copyright © 2017 Hasan Yavuz Özderya + Copyright © 2018 Hasan Yavuz Özderya This file is part of serialplot. @@ -47,7 +47,7 @@ private: enum class FileArch { unknown, - i386, + _i386, amd64, arm };