 -    usage();
 -  }
 -#endif
--  globals.byte_io_size = __min(file_size, globals.byte_io_size);
--  globals.byte_io_size = __max(0, globals.byte_io_size);
-+  globals.byte_io_size = min(file_size, globals.byte_io_size);
-+  globals.byte_io_size = max(0, globals.byte_io_size);
+   globals.byte_io_size = min(file_size, globals.byte_io_size);
+   globals.byte_io_size = max(0, globals.byte_io_size);
  
-   if(machine == NULL)
-   {
 @@ -465,14 +452,6 @@ int main(int argc, char *argv[])
       && (directory_max_size < directory_min_size || directory_max_size < 0
       || directory_min_size < 0) )

   if(file_size && globals.ram && (file_size * concurrency) < (globals.ram * 2) )
   {
     fprintf(stderr
diff --git i/duration.cpp w/duration.cpp
index efa3fd3..f943155 100644
--- i/duration.cpp
+++ w/duration.cpp
@@ -38,7 +38,7 @@ double Duration_Base::stop()
   getTime(&tv);
   double ret;
   ret = tv - m_start;
-  m_max = __max(m_max, ret);
+  m_max = max(m_max, ret);
   return ret;
 }
 
diff --git i/port.h w/port.h
index 8d53622..2e1f112 100644
--- i/port.h
+++ w/port.h
@@ -49,8 +49,6 @@ typedef struct timeval TIMEVAL_TYPE;
 #endif
 
 typedef int FILE_TYPE;
-#define __min min
-#define __max max
 typedef unsigned int UINT;
 typedef unsigned long ULONG;
 typedef const char * PCCHAR;
diff --git i/port.h.in w/port.h.in
index 69c8f24..8359d72 100644
--- i/port.h.in
+++ w/port.h.in
@@ -49,8 +49,6 @@ typedef struct timeval TIMEVAL_TYPE;
 #endif
 
 typedef int FILE_TYPE;
-#define __min min
-#define __max max
 typedef unsigned int UINT;
 typedef unsigned long ULONG;
 typedef const char * PCCHAR;

Derivied from a patch distributed with the Homebrew formula:
https://github.com/Homebrew/homebrew-core/blob/6ae11ea82c00dc8c11297ecc3f06bc33979862d8/Formula/bonnie++.rb


Copyright 2009-2016 Homebrew contributors.

Redistribution and use in source and binary forms, with or without
