diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2017-05-27 01:14:30 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2017-05-27 01:14:30 +0200 |
| commit | e199b0f7781e38b97eb6bb5d5bfa147f520da77c (patch) | |
| tree | e60046470ef269cbd03144c8f6ecd24cacbaed2b | |
| parent | f0c3db47bb2b37a13703385bf26bc4428278e218 (diff) | |
| download | tdegraphics-e199b0f7781e38b97eb6bb5d5bfa147f520da77c.tar.gz tdegraphics-e199b0f7781e38b97eb6bb5d5bfa147f520da77c.zip | |
Fix FTBFS on fmin redefinition
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
| -rw-r--r-- | config.h.cmake | 1 | ||||
| -rw-r--r-- | kviewshell/plugins/djvu/libdjvu/ConfigureChecks.cmake | 12 | ||||
| -rw-r--r-- | kviewshell/plugins/djvu/libdjvu/DjVuPalette.cpp | 3 |
3 files changed, 15 insertions, 1 deletions
diff --git a/config.h.cmake b/config.h.cmake index e6d1fd28..3e51ef68 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -39,6 +39,7 @@ #define HAS_MBSTATE 1 #endif #endif +#cmakedefine HAVE_FMIN 1 // kmrml #cmakedefine HAVE_STDLIB_H 1 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 |