From 2365b678b30470d9cf5580126335cee700ac1c4f Mon Sep 17 00:00:00 2001
From: SupSuper
Date: Thu, 9 May 2019 02:32:58 +0100
Subject: IMAGE: Fix MSVC warnings

Fixes warning C4067: unexpected tokens following preprocessor directive
due to non-standard "and" "or" operators
---
 image/jpeg.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'image')

diff --git a/image/jpeg.cpp b/image/jpeg.cpp
index 4605d178e1..2975cb1342 100644
--- a/image/jpeg.cpp
+++ b/image/jpeg.cpp
@@ -184,7 +184,7 @@ void outputMessage(j_common_ptr cinfo) {
 }
 
 J_COLOR_SPACE fromScummvmPixelFormat(const Graphics::PixelFormat &format) {
-#if defined(JCS_EXTENSIONS) or defined(JCS_ALPHA_EXTENSIONS)
+#if defined(JCS_EXTENSIONS) || defined(JCS_ALPHA_EXTENSIONS)
 	struct PixelFormatMapping {
 		Graphics::PixelFormat pixelFormat;
 		J_COLOR_SPACE bigEndianColorSpace;
@@ -200,7 +200,7 @@ J_COLOR_SPACE fromScummvmPixelFormat(const Graphics::PixelFormat &format) {
 		{ Graphics::PixelFormat(3, 8, 8, 8, 0, 16,  8,  0,  0), JCS_EXT_RGB,  JCS_EXT_BGR  },
 		{ Graphics::PixelFormat(3, 8, 8, 8, 0,  0,  8, 16,  0), JCS_EXT_BGR,  JCS_EXT_RGB  }
 #endif
-#if defined(JCS_EXTENSIONS) and defined(JCS_ALPHA_EXTENSIONS)
+#if defined(JCS_EXTENSIONS) && defined(JCS_ALPHA_EXTENSIONS)
 		,
 #endif
 #ifdef JCS_ALPHA_EXTENSIONS
-- 
cgit v1.2.3