Fixing some things...

2 files changed, 7 insertions, 8 deletions

diff --git a/include/generic.h b/include/generic.h
index f20eeb7..17f3538 100644
--- a/include/generic.h
+++ b/include/generic.h
@@ -13,14 +13,6 @@
 #define bcopy(x,y,z) memcpy((y),(x),(z))
 #endif
 
-#ifndef MAX
-#define MIN(a,b) ((a)<(b)?(a):(b))
-#endif
-
-#ifndef MAX
-#define MAX(a,b) ((a)<(b)?(b):(a)
-#endif
-
 #ifndef SDL_VERSIONNUM
 typedef unsigned long int Uint32;
 #endif
diff --git a/lib/generic.cc b/lib/generic.cc
index 6e6afb9..54e2fbf 100644
--- a/lib/generic.cc
+++ b/lib/generic.cc
@@ -23,6 +23,9 @@
 #include "config.h"
 #endif
 #include "BString.h"
+#ifdef HAVE_GMP
+#include <gmp.h>
+#endif
 
 char verbosity = 0;
 
@@ -40,7 +43,11 @@ void Base::printm(int level, const ugly_string & m, ...) {
     }
 
     va_start(ap, m);    
+#ifdef HAVE_GMP
+    gmp_vfprintf(stderr, m.p, ap);
+#else
     vfprintf(stderr, m.p, ap);
+#endif
     va_end(ap);
 }