Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build compatibility for MSVC++ 2017 #90

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Accept WIN32 per MSVC
  • Loading branch information
danni committed Feb 2, 2019
commit fe346cbd3b42556e5950ea4ec3660747d9e9f8e1
2 changes: 1 addition & 1 deletion src/BossaProgress.cpp
Original file line number Diff line number Diff line change
@@ -44,7 +44,7 @@ void
BossaProgress::SetValue(int pos)
{
_statusGauge->SetValue(pos);
#if __WIN32
#if defined(__WIN32__) || defined(WIN32)
// Work around slow update on Windows
_statusGauge->SetValue(pos - 1);
_statusGauge->SetValue(pos);
2 changes: 1 addition & 1 deletion src/Driver.h
Original file line number Diff line number Diff line change
@@ -42,7 +42,7 @@ class DriverBase
virtual bool update() = 0;
};

#ifdef __WIN32__
#if defined(__WIN32__) || defined(WIN32)
#include "WinDriver.h"
typedef WinDriver Driver;
#else
2 changes: 1 addition & 1 deletion src/PortFactory.h
Original file line number Diff line number Diff line change
@@ -48,7 +48,7 @@ class PortFactoryBase
virtual SerialPort::Ptr create(const std::string& name, bool isUsb) = 0;
};

#if defined(__WIN32__)
#if defined(__WIN32__) || defined(WIN32)
#include "WinPortFactory.h"
typedef WinPortFactory PortFactory;
#elif defined(__linux__)