Merge pull request #467 from adafruit/PR454-followup

partial revert PRITNF in lfs_util.h due to compilation error

Author: hathach

cores/nRF5/common_inc.h

@@ -40,7 +40,7 @@
 #include <stdbool.h>
 
 #include "compiler_macro.h"
-#include "verify.h"
 #include "common_func.h"
+#include "verify.h"
 
 #endif /* COMMON_INC_H_ */

libraries/Adafruit_LittleFS/src/littlefs/lfs_util.h

@@ -24,8 +24,6 @@
 #include <stdbool.h>
 #include <string.h>
 
-#include "FreeRTOS.h"
-
 #ifndef LFS_NO_MALLOC
 #include <stdlib.h>
 #endif
@@ -56,21 +54,21 @@ extern "C"
 // Logging functions
 #ifndef LFS_NO_DEBUG
 #define LFS_DEBUG(fmt, ...) \
-    PRINTF("lfs debug:%d: " fmt "\n", __LINE__, __VA_ARGS__)
+    printf("lfs debug:%d: " fmt "\n", __LINE__, __VA_ARGS__)
 #else
 #define LFS_DEBUG(fmt, ...)
 #endif
 
 #ifndef LFS_NO_WARN
 #define LFS_WARN(fmt, ...) \
-    PRINTF("lfs warn:%d: " fmt "\n", __LINE__, __VA_ARGS__)
+    printf("lfs warn:%d: " fmt "\n", __LINE__, __VA_ARGS__)
 #else
 #define LFS_WARN(fmt, ...)
 #endif
 
 #ifndef LFS_NO_ERROR
 #define LFS_ERROR(fmt, ...) \
-    PRINTF("lfs error:%d: " fmt "\n", __LINE__, __VA_ARGS__)
+    printf("lfs error:%d: " fmt "\n", __LINE__, __VA_ARGS__)
 #else
 #define LFS_ERROR(fmt, ...)
 #endif