summaryrefslogtreecommitdiffstats
path: root/libtommath/tommath_private.h
diff options
context:
space:
mode:
Diffstat (limited to 'libtommath/tommath_private.h')
-rw-r--r--libtommath/tommath_private.h10
1 files changed, 6 insertions, 4 deletions
diff --git a/libtommath/tommath_private.h b/libtommath/tommath_private.h
index f054fed..d23c333 100644
--- a/libtommath/tommath_private.h
+++ b/libtommath/tommath_private.h
@@ -18,11 +18,13 @@
#include <tommath.h>
#include <ctype.h>
-#if 0
-
+#ifndef MIN
#define MIN(x,y) (((x) < (y)) ? (x) : (y))
+#endif
+#ifndef MAX
#define MAX(x,y) (((x) > (y)) ? (x) : (y))
+#endif
#ifdef __cplusplus
extern "C" {
@@ -37,8 +39,8 @@ extern "C" {
#endif
-
/* define heap macros */
+#if 0
#ifndef XMALLOC
/* default to libc stuff */
#define XMALLOC malloc
@@ -52,6 +54,7 @@ extern "C" {
extern void *XCALLOC(size_t n, size_t s);
extern void XFREE(void *p);
#endif
+#endif
/* lowlevel functions, do not call! */
int s_mp_add(mp_int *a, mp_int *b, mp_int *c);
@@ -109,7 +112,6 @@ int func_name (mp_int * a, type b) \
mp_clamp (a); \
return MP_OKAY; \
}
-#endif
#ifdef __cplusplus
}