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.
   serialplot is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
@@ @@ -152,13 +152,13 @@ bool UpdateChecker::parseData(const QJso @@
+        {
             finfo.arch = FileArch::amd64;
+        }
         else if (finfo.name.contains("win32") ||
                  finfo.name.contains("i386"))
+        {
-            finfo.arch = FileArch::i386;
+            finfo.arch = FileArch::_i386;
+        }
         else
+        {
             finfo.arch = FileArch::unknown;
+        }
@@ @@ -183,13 +183,13 @@ bool UpdateChecker::findUpdate(const QLi @@
 #endif
         // file architecture to look
 #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
         #error Unknown architecture for update file detection.
 #endif

src/updatechecker.h

➞

Show inline comments

 /*
-  Copyright © 2017 Hasan Yavuz Özderya
+  Copyright © 2018 Hasan Yavuz Özderya
   This file is part of serialplot.
   serialplot is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
@@ @@ -44,13 +44,13 @@ public slots: @@
     void cancelCheck();
 private:
     enum class FileArch
+    {
         unknown,
-        i386,
+        _i386,
         amd64,
         arm
     };
     struct FileInfo
+    {

0 comments (0 inline, 0 general)