Fix MIN/MAX function collision with macros

This commit is contained in:
Scott Lahteine committed 2019-07-05 18:14:02 -05:00
1 parent b6546ea33a
commit 750a16ad38
63 files changed
+167 -167

No files matched your search

+1 -1
View File
@@ -293,7 +293,7 @@ public:
#if HAS_PRINT_PROGRESS
#if ENABLED(LCD_SET_PROGRESS_MANUALLY)
static uint8_t progress_bar_percent;
static void set_progress(const uint8_t progress) { progress_bar_percent = MIN(progress, 100); }
static void set_progress(const uint8_t progress) { progress_bar_percent = _MIN(progress, 100); }
#endif
static uint8_t get_progress();
#else