X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Frasterize;a=blobdiff_plain;f=common.h;h=33961a196ec680ea61d3176573f2510e7c52c159;hp=dd6f034bc9171fa9dd67e5d73d52e0ef7550de13;hb=09dd89d10e65029f0be313dd463ba1f43cac2fbb;hpb=b0a8ea303e942930350bf85c860afc969442c7a4

diff --git a/common.h b/common.h
index dd6f034..33961a1 100644
--- a/common.h
+++ b/common.h
@@ -15,6 +15,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "config.h"
+
 
 /*
  * Define a keyword for use while defining small and fast functions.
@@ -118,6 +120,16 @@ int imax(int a, int b)
     return a < b ? b : a;
 }
 
+/*
+ * Define generic MIN and MAX macros.
+ */
+#ifndef MIN
+#define MIN(A,B) (((A) < (B)) ? (A) : (B))
+#endif
+#ifndef MAX
+#define MAX(A,B) (((A) > (B)) ? (A) : (B))
+#endif
+
 
 /*
  * Define some macros for packing and unpacking bytes to and from larger ints.
@@ -132,11 +144,16 @@ int imax(int a, int b)
  * an error condition and an abort(3) occurs.
  * return.
  */
+#if VERBOSITY >= 1
 #define TRY_DO(L, K, ARGS...) \
 printf("* " L "... ", ##ARGS); \
 fflush(stdout); \
 if ((K) == 0) printf("done!\n"); \
 else abort()
+#else
+#define TRY_DO(L, K, ARGS...) \
+if ((K) != 0) abort()
+#endif
 
 
 /*
@@ -239,10 +256,11 @@ void ltrim(char *str);
  * Trim white space off of both sides of a string.
  */
 INLINE_MAYBE
-void trim(char *str)
+char* trim(char *str)
 {
     rtrim(str);
     ltrim(str);
+    return str;
 }