notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid redefining min and max on Haiku

Browse source
This commit is contained in:
Scott McCreary 2013-11-04 19:17:33 +00:00
parent fa665e06f0
commit 17dfb423b8
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/compiler.h
View file

@ -58,7 +58,7 @@
#ifndef __HAIKU__
#ifdef __GNUC__ #ifdef __GNUC__
// This version has strict type checking for safety. // This version has strict type checking for safety.
// See the "unnecessary" pointer comparison. (from Linux) // See the "unnecessary" pointer comparison. (from Linux)
@ -76,6 +76,7 @@
#define min(a,b) (((a) < (b)) ? (a) : (b)) #define min(a,b) (((a) < (b)) ? (a) : (b))
#define max(a,b) (((a) > (b)) ? (a) : (b)) #define max(a,b) (((a) > (b)) ? (a) : (b))
#endif #endif
#endif /* Not Haiku */
#define clamp(lo,value,hi) (min(max(value,lo),hi)) #define clamp(lo,value,hi) (min(max(value,lo),hi))

3
src/tp_magic_api.h.in
View file

@ -10,6 +10,7 @@
/* min() and max() variable comparisons: */ /* min() and max() variable comparisons: */
#ifndef __HAIKU__
#ifdef __GNUC__ #ifdef __GNUC__
// This version has strict type checking for safety. // This version has strict type checking for safety.
// See the "unnecessary" pointer comparison. (from Linux) // See the "unnecessary" pointer comparison. (from Linux)
@ -27,7 +28,7 @@
#define min(a,b) (((a) < (b)) ? (a) : (b)) #define min(a,b) (((a) < (b)) ? (a) : (b))
#define max(a,b) (((a) > (b)) ? (a) : (b)) #define max(a,b) (((a) > (b)) ? (a) : (b))
#endif #endif
#endif /* Not Haiku */
/* clamp() returns 'value', unless it's less than 'lo' or greater than 'hi', /* clamp() returns 'value', unless it's less than 'lo' or greater than 'hi',
in which cases it returns 'lo' or 'hi', respectively: */ in which cases it returns 'lo' or 'hi', respectively: */