tempo-plotter Changeset - be5188099290 · protofusion repositories

Changeset - be5188099290

Parent rev.

Child rev.

[Not reviewed]

default

0 2 0

Hasan Yavuz ÖZDERYA - 8 years ago 2018-03-26 15:04:34
hy@ozderya.net

fix windows build error due to conflicting "i386" definitions

2 files changed with 5 insertions and 5 deletions:

src/updatechecker.cpp

src/updatechecker.h

0 comments (0 inline, 0 general)

src/updatechecker.cpp

➞

Show inline comments

 /*
-  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

src/updatechecker.h

➞

Show inline comments

 /*
-  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
     };

0 comments (0 inline, 0 general)