Cleanup

- Removed unnecessary definitions of max() and min(), replaced existent calls
  with std::max().  Precursor to Bugfix #887.

Signed-off-by: Paul Beckingham <paul@beckingham.net>

src/util.h

@@ -40,14 +40,6 @@
 #include <uuid/uuid.h>
 #endif
 
-#ifndef min
-#define min(a,b) ((a) < (b) ? (a) : (b))
-#endif
-
-#ifndef max
-#define max(a,b) ((a) > (b) ? (a) : (b))
-#endif
-
 // util.cpp
 bool confirm (const std::string&);
 int confirm3 (const std::string&);