diff options
| author | Slávek Banko <[email protected]> | 2017-05-27 01:14:30 +0200 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2017-05-27 01:14:40 +0200 |
| commit | ec9ef61440bbf98e86d39b0bb228c66f19377c6c (patch) | |
| tree | 9bd330f082a3c1818ddf8618f4256d6ac63168a0 /kviewshell/plugins/djvu/libdjvu/DjVuPalette.cpp | |
| parent | 1a82170e1e82ad046d373e69782d063f74e18814 (diff) | |
| download | tdegraphics-ec9ef61440bbf98e86d39b0bb228c66f19377c6c.tar.gz tdegraphics-ec9ef61440bbf98e86d39b0bb228c66f19377c6c.zip | |
Fix FTBFS on fmin redefinition
Signed-off-by: Slávek Banko <[email protected]>
(cherry picked from commit e199b0f7781e38b97eb6bb5d5bfa147f520da77c)
Diffstat (limited to 'kviewshell/plugins/djvu/libdjvu/DjVuPalette.cpp')
| -rw-r--r-- | kviewshell/plugins/djvu/libdjvu/DjVuPalette.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
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 |