From a71fb98837092f5125ceaba26e611a40e070e591 Mon Sep 17 00:00:00 2001
From: Gerardo Tauriello <gerardo.tauriello@unibas.ch>
Date: Fri, 14 Jun 2019 13:15:10 +0200
Subject: [PATCH] Use malloc only in windows.

---
 modules/bindings/src/tmalign/basic_fun.h          | 4 +++-
 modules/img/base/src/raster_image/raster_image.cc | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/modules/bindings/src/tmalign/basic_fun.h b/modules/bindings/src/tmalign/basic_fun.h
index 91785c96e..8274428ee 100644
--- a/modules/bindings/src/tmalign/basic_fun.h
+++ b/modules/bindings/src/tmalign/basic_fun.h
@@ -7,7 +7,9 @@
 #include <math.h>
 #include <time.h>
 #include <string.h>
-#ifndef __APPLE__
+// OST-NOTE: ifdef was added here since malloc.h isn't required for Linux/Mac
+//           and for some compilers (clang, gcc8) it isn't available
+#ifdef _WIN32
 #include <malloc.h>
 #endif
 
diff --git a/modules/img/base/src/raster_image/raster_image.cc b/modules/img/base/src/raster_image/raster_image.cc
index 143e1110b..44cfdf1a9 100644
--- a/modules/img/base/src/raster_image/raster_image.cc
+++ b/modules/img/base/src/raster_image/raster_image.cc
@@ -24,7 +24,8 @@
   Authors: Ansgar Philippsen, Andreas Schenk
 */
 
-#ifndef __APPLE__
+#include <stdlib.h>
+#ifdef _WIN32
 #include <malloc.h>
 #endif
 #include <cmath>
-- 
GitLab