Commit 54b16784 authored by Leif Walsh's avatar Leif Walsh Committed by Yoni Fogel

refs #5368 don't define MIN if it's already defined


git-svn-id: file:///svn/toku/tokudb@48329 c7de825b-a66e-492c-adef-691d508d4ae1
parent a787e376
...@@ -1128,7 +1128,9 @@ void read_block_from_fd_into_rbuf( ...@@ -1128,7 +1128,9 @@ void read_block_from_fd_into_rbuf(
static const int read_header_heuristic_max = 32*1024; static const int read_header_heuristic_max = 32*1024;
#ifndef MIN
#define MIN(a,b) (((a)>(b)) ? (b) : (a)) #define MIN(a,b) (((a)>(b)) ? (b) : (a))
#endif
static void read_ftnode_header_from_fd_into_rbuf_if_small_enough (int fd, BLOCKNUM blocknum, FT h, struct rbuf *rb) static void read_ftnode_header_from_fd_into_rbuf_if_small_enough (int fd, BLOCKNUM blocknum, FT h, struct rbuf *rb)
// Effect: If the header part of the node is small enough, then read it into the rbuf. The rbuf will be allocated to be big enough in any case. // Effect: If the header part of the node is small enough, then read it into the rbuf. The rbuf will be allocated to be big enough in any case.
......
...@@ -10,7 +10,9 @@ ...@@ -10,7 +10,9 @@
#include "includes.h" #include "includes.h"
#ifndef MIN
#define MIN(x, y) (((x) < (y)) ? (x) : (y)) #define MIN(x, y) (((x) < (y)) ? (x) : (y))
#endif
const double USECS_PER_SEC = 1000000.0; const double USECS_PER_SEC = 1000000.0;
static int static int
......
...@@ -13,7 +13,9 @@ enum ftnode_verify_type { ...@@ -13,7 +13,9 @@ enum ftnode_verify_type {
read_none read_none
}; };
#ifndef MIN
#define MIN(x, y) (((x) < (y)) ? (x) : (y)) #define MIN(x, y) (((x) < (y)) ? (x) : (y))
#endif
static int static int
string_key_cmp(DB *UU(e), const DBT *a, const DBT *b) string_key_cmp(DB *UU(e), const DBT *a, const DBT *b)
......
...@@ -10,7 +10,9 @@ ...@@ -10,7 +10,9 @@
#include "includes.h" #include "includes.h"
#ifndef MIN
#define MIN(x, y) (((x) < (y)) ? (x) : (y)) #define MIN(x, y) (((x) < (y)) ? (x) : (y))
#endif
const double USECS_PER_SEC = 1000000.0; const double USECS_PER_SEC = 1000000.0;
static int omt_cmp(OMTVALUE p, void *q) static int omt_cmp(OMTVALUE p, void *q)
......
...@@ -7,7 +7,9 @@ ...@@ -7,7 +7,9 @@
#include "includes.h" #include "includes.h"
#ifndef MIN
#define MIN(x, y) (((x) < (y)) ? (x) : (y)) #define MIN(x, y) (((x) < (y)) ? (x) : (y))
#endif
static int omt_int_cmp(OMTVALUE p, void *q) static int omt_int_cmp(OMTVALUE p, void *q)
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment