orfeo-50-patches.diff

diff --git a/Modules/Core/Common/include/otbConfigurationManager.h b/Modules/Core/Common/include/otbConfigurationManager.h
index d89de91..6d8e7bc 100644
--- a/Modules/Core/Common/include/otbConfigurationManager.h
+++ b/Modules/Core/Common/include/otbConfigurationManager.h
@@ -18,7 +18,13 @@
 #ifndef _otbConfigurationManager_h
 #define _otbConfigurationManager_h
 
+#include "itkVersion.h"
+
+#if ITK_VERSION_MAJOR < 4 || (ITK_VERSION_MAJOR == 4 && ITK_VERSION_MINOR <= 8)
+#include "itksys/FundamentalType.h"
+#else
 #include "itk_kwiml.h"
+#endif
 
 #include <string>
 #include <boost/cstdint.hpp>
@@ -38,7 +44,11 @@ namespace otb
 class ConfigurationManager
 {
 public:
+#if ITK_VERSION_MAJOR < 4 || (ITK_VERSION_MAJOR == 4 && ITK_VERSION_MINOR <= 8)
+  typedef ::itksysFundamentalType_UInt64 RAMValueType;
+#else
   typedef KWIML_INT_uint64_t RAMValueType;
+#endif
 
   /**
    * DEMDirectory is a directory were DEM tiles are stored. 
diff --git a/Modules/Core/Streaming/include/otbPipelineMemoryPrintCalculator.h b/Modules/Core/Streaming/include/otbPipelineMemoryPrintCalculator.h
index 1204827..b3555bc 100644
--- a/Modules/Core/Streaming/include/otbPipelineMemoryPrintCalculator.h
+++ b/Modules/Core/Streaming/include/otbPipelineMemoryPrintCalculator.h
@@ -19,7 +19,11 @@
 #define __otbPipelineMemoryPrintCalculator_h
 
 #include "itkProcessObject.h"
+#if ITK_VERSION_MAJOR < 4 || (ITK_VERSION_MAJOR == 4 && ITK_VERSION_MINOR <= 8)
+#include "itksys/FundamentalType.h"
+#else
 #include "itk_kwiml.h"
+#endif
 #include <set>
 
 namespace otb
@@ -75,7 +79,11 @@ public:
   typedef ProcessObjectType::Pointer          ProcessObjectPointerType;
   typedef itk::DataObject                     DataObjectType;
   typedef DataObjectType::Pointer             DataObjectPointerType;
+#if ITK_VERSION_MAJOR < 4 || (ITK_VERSION_MAJOR == 4 && ITK_VERSION_MINOR <= 8)
+  typedef ::itksysFundamentalType_UInt64      MemoryPrintType;
+#else
   typedef KWIML_INT_uint64_t                  MemoryPrintType;
+#endif
   typedef std::set<const ProcessObjectType *> ProcessObjectPointerSetType;
 
   /** Run-time type information (and related methods). */
-- 
1.7.10.4