From 687f1e5bba46bb7c2b908429af807f14ca9496bc Mon Sep 17 00:00:00 2001 From: daniel-k Date: Wed, 10 Jan 2018 15:45:24 +0100 Subject: [PATCH] lib/ips/fifo: use std:min in favor of old macro --- fpga/lib/ips/fifo.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fpga/lib/ips/fifo.cpp b/fpga/lib/ips/fifo.cpp index 2dd1276b9..a8378dc37 100644 --- a/fpga/lib/ips/fifo.cpp +++ b/fpga/lib/ips/fifo.cpp @@ -108,7 +108,7 @@ size_t Fifo::write(const void *buf, size_t len) size_t Fifo::read(void *buf, size_t len) { size_t nextlen = 0; - uint32_t rxlen; + size_t rxlen; auto intc = reinterpret_cast(dependencies["intc"]); @@ -119,7 +119,7 @@ size_t Fifo::read(void *buf, size_t len) /* Get length of next frame */ rxlen = XLlFifo_RxGetLen(&xFifo); - nextlen = MIN(rxlen, len); + nextlen = std::min(rxlen, len); /* Read from FIFO */ XLlFifo_Read(&xFifo, buf, nextlen);