From e35eebd4d408a20d37e1af288a4fd0818a9f0be8 Mon Sep 17 00:00:00 2001 From: "marina.kolpakova" Date: Wed, 9 Jan 2013 17:23:21 +0400 Subject: [PATCH] fix android build --- apps/sft/include/sft/random.hpp | 2 +- modules/ml/src/octave.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/sft/include/sft/random.hpp b/apps/sft/include/sft/random.hpp index e184da629..3a3be8bbc 100644 --- a/apps/sft/include/sft/random.hpp +++ b/apps/sft/include/sft/random.hpp @@ -54,7 +54,7 @@ struct Random }; } -#elif (__GNUC__) && __GNUC__ > 3 && __GNUC_MINOR__ > 1 +#elif (__GNUC__) && __GNUC__ > 3 && __GNUC_MINOR__ > 1 && !defined(__ANDROID__) # if defined (__cplusplus) && __cplusplus > 201100L # include diff --git a/modules/ml/src/octave.cpp b/modules/ml/src/octave.cpp index d9a2db3b1..bf37ba978 100644 --- a/modules/ml/src/octave.cpp +++ b/modules/ml/src/octave.cpp @@ -64,7 +64,7 @@ struct Random }; } -#elif (__GNUC__) && __GNUC__ > 3 && __GNUC_MINOR__ > 1 +#elif (__GNUC__) && __GNUC__ > 3 && __GNUC_MINOR__ > 1 && !defined(__ANDROID__) # if defined (__cplusplus) && __cplusplus > 201100L # include