From: Anatoliy Talamanov <anatoliy.talamanov@intel.com>
Date: Sat, 20 Aug 2022 17:24:41 +0000 (+0100)
Subject: Merge pull request #22393 from TolyaTalamanov:at/fix-gapi-vpl-windows-build
X-Git-Tag: accepted/tizen/unified/20230127.161057~1^2~210
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=925ff6241ffe46e9e2687d5c527196e99f55282e;p=platform%2Fupstream%2Fopencv.git

Merge pull request #22393 from TolyaTalamanov:at/fix-gapi-vpl-windows-build

* Fix G-API OneVPL compilation

* Fix macro

__WIN32__ -> _WIN32
---

diff --git a/modules/gapi/src/streaming/onevpl/cfg_param_device_selector.cpp b/modules/gapi/src/streaming/onevpl/cfg_param_device_selector.cpp
index 68d4fce1b9..26abe3cfb4 100644
--- a/modules/gapi/src/streaming/onevpl/cfg_param_device_selector.cpp
+++ b/modules/gapi/src/streaming/onevpl/cfg_param_device_selector.cpp
@@ -250,7 +250,7 @@ CfgParamDeviceSelector::CfgParamDeviceSelector(const CfgParams& cfg_params) :
             GAPI_Assert(false && "VPLVAAPIAccelerationPolicy unavailable in current linux configuration");
 #endif // defined(HAVE_VA) || defined(HAVE_VA_INTEL)
 #else // #ifdef __linux__
-            GAPI_Assert(false && "MFX_IMPL_VIA_VAAPI is supported on linux only")
+            GAPI_Assert(false && "MFX_IMPL_VIA_VAAPI is supported on linux only");
 #endif // #ifdef __linux__
             break;
         }
@@ -341,7 +341,7 @@ CfgParamDeviceSelector::CfgParamDeviceSelector(Device::Ptr device_ptr,
             GAPI_Assert(false && "VPLVAAPIAccelerationPolicy unavailable in current linux configuration");
 #endif // defined(HAVE_VA) || defined(HAVE_VA_INTEL)
 #else // #ifdef __linux__
-            GAPI_Assert(false && "MFX_IMPL_VIA_VAAPI is supported on linux only")
+            GAPI_Assert(false && "MFX_IMPL_VIA_VAAPI is supported on linux only");
 #endif // #ifdef __linux__
             break;
         }
@@ -400,7 +400,7 @@ CfgParamDeviceSelector::CfgParamDeviceSelector(const Device &device,
             GAPI_Assert(false && "VPLVAAPIAccelerationPolicy unavailable in current linux configuration");
 #endif // defined(HAVE_VA) || defined(HAVE_VA_INTEL)
 #else // #ifdef __linux__
-            GAPI_Assert(false && "MFX_IMPL_VIA_VAAPI is supported on linux only")
+            GAPI_Assert(false && "MFX_IMPL_VIA_VAAPI is supported on linux only");
 #endif // #ifdef __linux__
             break;
         case AccelType::HOST:
diff --git a/modules/gapi/test/streaming/gapi_streaming_tests.cpp b/modules/gapi/test/streaming/gapi_streaming_tests.cpp
index 5cac4df845..111f43bd19 100644
--- a/modules/gapi/test/streaming/gapi_streaming_tests.cpp
+++ b/modules/gapi/test/streaming/gapi_streaming_tests.cpp
@@ -2440,7 +2440,7 @@ TEST(OneVPL_Source, Init)
 
     std::vector<CfgParam> src_params;
     src_params.push_back(CfgParam::create_implementation(MFX_IMPL_TYPE_HARDWARE));
-#ifdef __WIN32
+#ifdef _WIN32
     src_params.push_back(CfgParam::create_acceleration_mode(MFX_ACCEL_MODE_VIA_D3D11));
 #elif defined(__linux__)
     src_params.push_back(CfgParam::create_acceleration_mode(MFX_ACCEL_MODE_VIA_VAAPI));