Skip to content

partial revert PRITNF in lfs_util.h due to compilation error #467

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hathach merged 1 commit into from
Mar 20, 2020
Merged

partial revert PRITNF in lfs_util.h due to compilation error #467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cores/nRF5/common_inc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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_ */
8 changes: 3 additions & 5 deletions libraries/Adafruit_LittleFS/src/littlefs/lfs_util.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@
#include <stdbool.h>
#include <string.h>

#include "FreeRTOS.h"

#ifndef LFS_NO_MALLOC
#include <stdlib.h>
#endif
Expand Down Expand Up @@ -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
Expand Down