haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix preprocessor expression 

The "and" and "or" keywords are only defined if <iso646.h> is included.

This fixes the C4067 warnings.
This commit is contained in:
Simon Richter 2020-02-29 21:30:21 +01:00 committed by Ian McInerney
parent c31089d9f4
commit 0f105c4c9a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/cursor_store.cpp
View File

@ -39,7 +39,7 @@
*/
wxCursor constructCursor( const CURSOR_STORE::CURSOR_DEF& aDef )
{
#if defined( __WXMSW__ ) or defined( __WXMAC__ )
#if defined( __WXMSW__ ) || defined( __WXMAC__ )
wxBitmap img_bitmap(
reinterpret_cast<const char*>( aDef.m_image_data ), aDef.m_size.x, aDef.m_size.y );
@ -58,7 +58,7 @@ wxCursor constructCursor( const CURSOR_STORE::CURSOR_DEF& aDef )
return wxCursor{ image };
#elif defined( __WXGTK__ ) or defined( __WXMOTIF__ )
#elif defined( __WXGTK__ ) || defined( __WXMOTIF__ )
return wxCursor{
reinterpret_cast<const char*>( aDef.m_image_data ),
@ -97,4 +97,4 @@ const wxCursor& CURSOR_STORE::Get( int aIdKey ) const
wxASSERT_MSG( false,
wxString::Format( "Could not find cursor with ID %d", static_cast<int>( aIdKey ) ) );
return wxNullCursor;
}
}