diff options
author | 2016-07-31 11:50:20 +0200 | |
---|---|---|
committer | 2016-07-31 14:41:02 +0200 | |
commit | 9667c6a8cce1829a7321dde67bd0287c73234386 (patch) | |
tree | f3665957d557cb18728a40e75f7d9f2341aaff1d /src/lib/formats/ioprocs.cpp | |
parent | 69ac4affc86caac51ff9720083ed128dabdb932f (diff) |
std::min and std:max instead of MIN and MAX, also some more macros converted to inline functions (nw)
Diffstat (limited to 'src/lib/formats/ioprocs.cpp')
-rw-r--r-- | src/lib/formats/ioprocs.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/formats/ioprocs.cpp b/src/lib/formats/ioprocs.cpp index 3efb1055e56..0be7cab97f4 100644 --- a/src/lib/formats/ioprocs.cpp +++ b/src/lib/formats/ioprocs.cpp @@ -196,11 +196,11 @@ void io_generic_write_filler(struct io_generic *genio, UINT8 filler, UINT64 offs UINT8 buffer[512]; size_t this_length; - memset(buffer, filler, MIN(length, sizeof(buffer))); + memset(buffer, filler, std::min(length, sizeof(buffer))); while(length > 0) { - this_length = MIN(length, sizeof(buffer)); + this_length = std::min(length, sizeof(buffer)); io_generic_write(genio, buffer, offset, this_length); offset += this_length; length -= this_length; |