diff options
Diffstat (limited to 'src/c/statisticsFunctions')
| -rw-r--r-- | src/c/statisticsFunctions/includes/statMax.h | 2 | ||||
| -rw-r--r-- | src/c/statisticsFunctions/includes/statMin.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/c/statisticsFunctions/includes/statMax.h b/src/c/statisticsFunctions/includes/statMax.h index c3f1909..8e5d12b 100644 --- a/src/c/statisticsFunctions/includes/statMax.h +++ b/src/c/statisticsFunctions/includes/statMax.h @@ -20,7 +20,7 @@ extern "C" { #endif -#define max(a,b) (a>=b?a:b) +//#define max(a,b) (a>=b?a:b) #define maxa(a,size1,b,size2,out) {int i;\ for (i=0;i<size1[0]*size2[1];i++) out[i]=max(a[i],b[i]);\ diff --git a/src/c/statisticsFunctions/includes/statMin.h b/src/c/statisticsFunctions/includes/statMin.h index ac73285..f3b8268 100644 --- a/src/c/statisticsFunctions/includes/statMin.h +++ b/src/c/statisticsFunctions/includes/statMin.h @@ -20,7 +20,7 @@ extern "C" { #endif -#define min(a,b) (a<=b?a:b) +//#define min(a,b) (a<=b?a:b) #define mina(a,size1,b,size2,out) {int i;\ for (i=0;i<size1[0]*size2[1];i++) out[i]=min(a[i],b[i]);\ |