summaryrefslogtreecommitdiffstats
path: root/kviewshell
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2017-05-27 01:14:30 +0200
committerSlávek Banko <slavek.banko@axis.cz>2017-05-27 01:14:40 +0200
commitec9ef61440bbf98e86d39b0bb228c66f19377c6c (patch)
tree9bd330f082a3c1818ddf8618f4256d6ac63168a0 /kviewshell
parent1a82170e1e82ad046d373e69782d063f74e18814 (diff)
downloadtdegraphics-ec9ef61440bbf98e86d39b0bb228c66f19377c6c.tar.gz
tdegraphics-ec9ef61440bbf98e86d39b0bb228c66f19377c6c.zip
Fix FTBFS on fmin redefinition
Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit e199b0f7781e38b97eb6bb5d5bfa147f520da77c)
Diffstat (limited to 'kviewshell')
-rw-r--r--kviewshell/plugins/djvu/libdjvu/ConfigureChecks.cmake12
-rw-r--r--kviewshell/plugins/djvu/libdjvu/DjVuPalette.cpp3
2 files changed, 14 insertions, 1 deletions
diff --git a/kviewshell/plugins/djvu/libdjvu/ConfigureChecks.cmake b/kviewshell/plugins/djvu/libdjvu/ConfigureChecks.cmake
index 50f708f1..aa63d2f4 100644
--- a/kviewshell/plugins/djvu/libdjvu/ConfigureChecks.cmake
+++ b/kviewshell/plugins/djvu/libdjvu/ConfigureChecks.cmake
@@ -10,6 +10,7 @@
#################################################
include( CheckFunctionExists )
+include( CheckCXXSourceCompiles )
check_type_size( wchar_t WCHAR_T )
@@ -23,3 +24,14 @@ if( HAVE_WCHAR_T )
check_function_exists( wcrtomb HAVE_WCRTOMB )
endif( )
endif( )
+
+check_cxx_source_compiles(
+ "
+ #include <cmath>
+ int main(int, char*[]) {
+ float res = fmin(0, 1);
+ return 0;
+ }
+ "
+ HAVE_FMIN
+)
diff --git a/kviewshell/plugins/djvu/libdjvu/DjVuPalette.cpp b/kviewshell/plugins/djvu/libdjvu/DjVuPalette.cpp
index 98175159..0b8fa614 100644
--- a/kviewshell/plugins/djvu/libdjvu/DjVuPalette.cpp
+++ b/kviewshell/plugins/djvu/libdjvu/DjVuPalette.cpp
@@ -97,10 +97,11 @@ inline unsigned char
umin(unsigned char a, unsigned char b)
{ return (a>b) ? b : a; }
+#if !defined(HAVE_FMIN)
inline float
fmin(float a, float b)
{ return (a>b) ? b : a; }
-
+#endif
// ------- DJVUPALETTE