X-Git-Url: http://git.linex4red.de/pub/lufa.git/blobdiff_plain/f1b6ddb7107fd9534cc6a8d6ab2d46f349d9cdb7..eb1275890a3aec518480916cb40ff675dc1bcb4e:/LUFA/Common/Common.h

diff --git a/LUFA/Common/Common.h b/LUFA/Common/Common.h
index 35c739a3a..8b1845a08 100644
--- a/LUFA/Common/Common.h
+++ b/LUFA/Common/Common.h
@@ -89,6 +89,7 @@
 			#include <avr/pgmspace.h>
 			#include <avr/eeprom.h>
 			#include <avr/boot.h>
+			#include <math.h>
 			#include <util/delay.h>
 
 			typedef uint8_t uint_reg_t;
@@ -119,6 +120,7 @@
 			#include <avr/interrupt.h>
 			#include <avr/pgmspace.h>
 			#include <avr/eeprom.h>
+			#include <math.h>
 			#include <util/delay.h>
 
 			typedef uint8_t uint_reg_t;
@@ -151,8 +153,8 @@
 
 			/** Convenience macro to determine the larger of two values.
 			 *
-			 *  \note This macro should only be used with operands that do not have side effects from being evaluated
-			 *        multiple times.
+			 *  \attention This macro should only be used with operands that do not have side effects from being evaluated
+			 *             multiple times.
 			 *
 			 *  \param[in] x  First value to compare
 			 *  \param[in] y  First value to compare
@@ -165,8 +167,8 @@
 
 			/** Convenience macro to determine the smaller of two values.
 			 *
-			 *  \note This macro should only be used with operands that do not have side effects from being evaluated
-			 *        multiple times.
+			 *  \attention This macro should only be used with operands that do not have side effects from being evaluated
+			 *             multiple times.
 			 *
 			 *  \param[in] x  First value to compare
 			 *  \param[in] y  First value to compare
@@ -256,7 +258,7 @@
 				while (Milliseconds--)
 				{
 					__builtin_mtsr(AVR32_COUNT, 0);
-					while (__builtin_mfsr(AVR32_COUNT) < (F_CPU / 1000));
+					while ((uint32_t)__builtin_mfsr(AVR32_COUNT) < (F_CPU / 1000));
 				}
 				#elif (ARCH == ARCH_XMEGA)
 				if (GCC_IS_COMPILE_CONST(Milliseconds))