|
 |
a50097e |
--- bonnie++-1.96/port.h.in.orig 2016-02-02 16:27:37.985436571 +0000
|
|
|
a50097e |
+++ bonnie++-1.96/port.h.in 2016-02-02 16:34:54.335729981 +0000
|
|
|
a50097e |
@@ -4,9 +4,9 @@
|
|
|
a50097e |
#include "conf.h"
|
|
|
a50097e |
|
|
|
a50097e |
#ifndef HAVE_MIN_MAX
|
|
|
a50097e |
-#if defined(HAVE_ALGO_H) || defined(HAVE_ALGO)
|
|
|
a50097e |
-#ifdef HAVE_ALGO
|
|
|
a50097e |
-#include <algo>
|
|
|
a50097e |
+#if defined(HAVE_ALGO_H) || defined(HAVE_ALGORITHM)
|
|
|
a50097e |
+#ifdef HAVE_ALGORITHM
|
|
|
a50097e |
+#include <algorithm>
|
|
|
a50097e |
#else
|
|
|
a50097e |
#include <algo.h>
|
|
|
a50097e |
#endif
|
|
|
a50097e |
@@ -49,8 +49,8 @@
|
|
|
a50097e |
#endif
|
|
|
a50097e |
|
|
|
a50097e |
typedef int FILE_TYPE;
|
|
|
a50097e |
-#define __min min
|
|
|
a50097e |
-#define __max max
|
|
|
a50097e |
+// #define __min min
|
|
|
a50097e |
+// #define __max max
|
|
|
a50097e |
typedef unsigned int UINT;
|
|
|
a50097e |
typedef unsigned long ULONG;
|
|
|
a50097e |
typedef const char * PCCHAR;
|
|
|
a50097e |
--- bonnie++-1.96/bonnie++.cpp.orig 2016-02-02 16:35:22.160876227 +0000
|
|
|
a50097e |
+++ bonnie++-1.96/bonnie++.cpp 2016-02-02 16:37:23.018511442 +0000
|
|
|
a50097e |
@@ -73,7 +73,7 @@
|
|
|
a50097e |
void set_io_chunk_size(int size)
|
|
|
a50097e |
{ delete m_buf; pa_new(size, m_buf, m_buf_pa); m_io_chunk_size = size; }
|
|
|
a50097e |
void set_file_chunk_size(int size)
|
|
|
a50097e |
- { delete m_buf; m_buf = new char[__max(size, m_io_chunk_size)]; m_file_chunk_size = size; }
|
|
|
a50097e |
+ { delete m_buf; m_buf = new char[max(size, m_io_chunk_size)]; m_file_chunk_size = size; }
|
|
|
a50097e |
|
|
|
a50097e |
// Return the page-aligned version of the local buffer
|
|
|
a50097e |
char *buf() { return m_buf_pa; }
|
|
|
a50097e |
@@ -138,7 +138,7 @@
|
|
|
a50097e |
, m_buf(NULL)
|
|
|
a50097e |
, m_buf_pa(NULL)
|
|
|
a50097e |
{
|
|
|
a50097e |
- pa_new(__max(m_io_chunk_size, m_file_chunk_size), m_buf, m_buf_pa);
|
|
|
a50097e |
+ pa_new(max(m_io_chunk_size, m_file_chunk_size), m_buf, m_buf_pa);
|
|
|
a50097e |
SetName(".");
|
|
|
a50097e |
}
|
|
|
a50097e |
|
|
|
a50097e |
@@ -393,8 +393,8 @@
|
|
|
a50097e |
usage();
|
|
|
a50097e |
}
|
|
|
a50097e |
#endif
|
|
|
a50097e |
- globals.byte_io_size = __min(file_size, globals.byte_io_size);
|
|
|
a50097e |
- globals.byte_io_size = __max(0, globals.byte_io_size);
|
|
|
a50097e |
+ globals.byte_io_size = min(file_size, globals.byte_io_size);
|
|
|
a50097e |
+ globals.byte_io_size = max(0, globals.byte_io_size);
|
|
|
a50097e |
|
|
|
a50097e |
if(machine == NULL)
|
|
|
a50097e |
{
|
|
|
a50097e |
--- bonnie++-1.96/duration.cpp.orig 2016-02-02 16:40:22.751456099 +0000
|
|
|
a50097e |
+++ bonnie++-1.96/duration.cpp 2016-02-02 16:40:31.686503061 +0000
|
|
|
a50097e |
@@ -38,7 +38,7 @@
|
|
|
a50097e |
getTime(&tv;;
|
|
|
a50097e |
double ret;
|
|
|
a50097e |
ret = tv - m_start;
|
|
|
a50097e |
- m_max = __max(m_max, ret);
|
|
|
a50097e |
+ m_max = max(m_max, ret);
|
|
|
a50097e |
return ret;
|
|
|
a50097e |
}
|
|
|
a50097e |
|