1*4882a593SmuzhiyunFrom 2e4cf095afdcf843e93d1bdea9dbd961558f09bd Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Fabrice Fontaine <fontaine.fabrice@gmail.com> 3*4882a593SmuzhiyunDate: Sun, 13 Jan 2019 21:01:19 +0100 4*4882a593SmuzhiyunSubject: [PATCH] SerialPort.cpp: fix build when size_t is an unsigned int 5*4882a593Smuzhiyun 6*4882a593Smuzhiyunsize_t can be defined as an unsigned int instead of long unsigned int so 7*4882a593Smuzhiyunreplace 1UL to (size_t)1 when calling max function 8*4882a593Smuzhiyun 9*4882a593SmuzhiyunSigned-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> 10*4882a593Smuzhiyun[Upstream status: https://github.com/crayzeewulf/libserial/pull/126] 11*4882a593Smuzhiyun--- 12*4882a593Smuzhiyun src/SerialPort.cpp | 4 ++-- 13*4882a593Smuzhiyun 1 file changed, 2 insertions(+), 2 deletions(-) 14*4882a593Smuzhiyun 15*4882a593Smuzhiyundiff --git a/src/SerialPort.cpp b/src/SerialPort.cpp 16*4882a593Smuzhiyunindex e354fcb..75e762e 100644 17*4882a593Smuzhiyun--- a/src/SerialPort.cpp 18*4882a593Smuzhiyun+++ b/src/SerialPort.cpp 19*4882a593Smuzhiyun@@ -2208,7 +2208,7 @@ namespace LibSerial 20*4882a593Smuzhiyun 21*4882a593Smuzhiyun // Local variables. 22*4882a593Smuzhiyun size_t number_of_bytes_read = 0 ; 23*4882a593Smuzhiyun- size_t number_of_bytes_remaining = std::max(numberOfBytes, 1UL) ; 24*4882a593Smuzhiyun+ size_t number_of_bytes_remaining = std::max(numberOfBytes, (size_t)1) ; 25*4882a593Smuzhiyun size_t maximum_number_of_bytes = dataBuffer.max_size() ; 26*4882a593Smuzhiyun 27*4882a593Smuzhiyun // Clear the data buffer and reserve enough space in the buffer to store the incoming data. 28*4882a593Smuzhiyun@@ -2302,7 +2302,7 @@ namespace LibSerial 29*4882a593Smuzhiyun 30*4882a593Smuzhiyun // Local variables. 31*4882a593Smuzhiyun size_t number_of_bytes_read = 0 ; 32*4882a593Smuzhiyun- size_t number_of_bytes_remaining = std::max(numberOfBytes, 1UL) ; 33*4882a593Smuzhiyun+ size_t number_of_bytes_remaining = std::max(numberOfBytes, (size_t)1) ; 34*4882a593Smuzhiyun size_t maximum_number_of_bytes = dataString.max_size() ; 35*4882a593Smuzhiyun 36*4882a593Smuzhiyun // Clear the data buffer and reserve enough space in the buffer to store the incoming data. 37*4882a593Smuzhiyun-- 38*4882a593Smuzhiyun2.14.1 39*4882a593Smuzhiyun 40