105c105
< # error sizeof(size_t) is not 32-bit or 64-bit
---
> # error size_t is not 32-bit or 64-bit
109c109
< # error sizeof(size_t) is not 32-bit or 64-bit
---
> # error size_t is not 32-bit or 64-bit
159,161c159,163
< #ifndef MIN
< # define MIN(x, y) ((x) < (y) ? (x) : (y))
< #endif
---
> // NOTE: Avoid using MIN() and MAX(), because even conditionally defining
> // those macros can cause some portability trouble, since on some systems
> // the system headers insist defining their own versions.
> #define my_min(x, y) ((x) < (y) ? (x) : (y))
> #define my_max(x, y) ((x) > (y) ? (x) : (y))
163,166d164
< #ifndef MAX
< # define MAX(x, y) ((x) > (y) ? (x) : (y))
< #endif
<