From 0f105c4c9af7b782ee84b6c68815cc289062b316 Mon Sep 17 00:00:00 2001
From: Simon Richter <Simon.Richter@hogyros.de>
Date: Sat, 29 Feb 2020 21:30:21 +0100
Subject: [PATCH] Fix preprocessor expression

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

This fixes the C4067 warnings.
---
 common/cursor_store.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/cursor_store.cpp b/common/cursor_store.cpp
index 616c089211..2769f59196 100644
--- a/common/cursor_store.cpp
+++ b/common/cursor_store.cpp
@@ -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;
-}
\ No newline at end of file
+}