From 226e74a438c1dac72e575dbf39371e0f50335118 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20Br=C3=A1zio?= <jbrazio@gmail.com>
Date: Sat, 30 Jul 2016 02:56:26 +0100
Subject: [PATCH] Fixes safe_delay() to be fully compatible with delay()

---
 Marlin/Marlin.h    | 6 ++----
 Marlin/utility.cpp | 3 ++-
 Marlin/utility.h   | 7 ++++++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Marlin/Marlin.h b/Marlin/Marlin.h
index ded8b1f50..1e14fbf1c 100644
--- a/Marlin/Marlin.h
+++ b/Marlin/Marlin.h
@@ -35,13 +35,11 @@
 
 #include "MarlinConfig.h"
 
-#include "fastio.h"
-
 #include "enum.h"
+#include "types.h"
+#include "fastio.h"
 #include "utility.h"
 
-typedef unsigned long millis_t;
-
 #ifdef USBCON
   #include "HardwareSerial.h"
   #if ENABLED(BLUETOOTH)
diff --git a/Marlin/utility.cpp b/Marlin/utility.cpp
index 385fe3d39..0285219c4 100644
--- a/Marlin/utility.cpp
+++ b/Marlin/utility.cpp
@@ -21,9 +21,10 @@
  */
 
 #include "Marlin.h"
+#include "utility.h"
 #include "temperature.h"
 
-void safe_delay(uint16_t ms) {
+void safe_delay(millis_t ms) {
   while (ms > 50) {
     ms -= 50;
     delay(50);
diff --git a/Marlin/utility.h b/Marlin/utility.h
index 8bb3a9b8b..8ca70dbf8 100644
--- a/Marlin/utility.h
+++ b/Marlin/utility.h
@@ -20,4 +20,9 @@
  *
  */
 
-void safe_delay(uint16_t ms);
+#ifndef __UTILITY_H__
+#define __UTILITY_H__
+
+void safe_delay(millis_t ms);
+
+#endif