From 75c7917643b31e6ce10d22a3fa84299247c4e735 Mon Sep 17 00:00:00 2001
From: Pavel Vlasov <pavel.vlasov@intel.com>
Date: Tue, 29 Sep 2015 17:24:18 +0300
Subject: [PATCH] IPP_VERSION_X100 was changed to: IPP_VERSION_MAJOR * 100 +
 IPP_VERSION_MINOR*10 + IPP_VERSION_UPDATE to manage changes between updates
 more easily.

IPP_DISABLE_BLOCK was added to ease tracking of disabled IPP functions;
---
 modules/core/src/stat.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/core/src/stat.cpp b/modules/core/src/stat.cpp
index 999640d94..a1ceb5702 100644
--- a/modules/core/src/stat.cpp
+++ b/modules/core/src/stat.cpp
@@ -2701,7 +2701,7 @@ static bool ipp_norm(Mat &src, int normType, Mat &mask, double &result)
                     return true;
                 }
             }
-#if IPP_DISABLED_BLOCK
+#if IPP_DISABLE_BLOCK
             typedef IppStatus (CV_STDCALL* ippiMaskNormFuncC3)(const void *, int, const void *, int, IppiSize, int, Ipp64f *);
             ippiMaskNormFuncC3 ippFuncC3 =
                 normType == NORM_INF ?