Fix per #66

Use rf24_min vs min/std::min
nRF24 · Nov 26, 2015 · 8552324 · 8552324
1 parent 7eba4ad
commit 8552324
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/RF24Network.cpp b/RF24Network.cpp
@@ -619,7 +619,7 @@ uint16_t RF24Network::read(RF24NetworkHeader& header,void* message, uint16_t max
     RF24NetworkFrame frame = frame_queue.front();
 
     // How much buffer size should we actually copy?
-    bufsize = std::min(frame.message_size,maxlen);
+    bufsize = rf24_min(frame.message_size,maxlen);
     memcpy(&header,&(frame.header),sizeof(RF24NetworkHeader));
     memcpy(message,frame.message_buffer,bufsize);
 
@@ -640,7 +640,7 @@ uint16_t RF24Network::read(RF24NetworkHeader& header,void* message, uint16_t max
 
     if (maxlen > 0)
     {		
-		maxlen = min(maxlen,bufsize);
+		maxlen = rf24_min(maxlen,bufsize);
 		memcpy(message,frame_queue+10,maxlen);
 	    IF_SERIAL_DEBUG(printf("%lu: NET message size %d\n",millis(),bufsize););