projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added test target to makefile.
[yaffs2.git]
/
yportenv_multi.h
diff --git
a/yportenv_multi.h
b/yportenv_multi.h
index 8975af331ea12230ab0b8db9dcf2a2092e9c2e31..68c239c0743513a6076bfec3df48a77edb886eec 100644
(file)
--- a/
yportenv_multi.h
+++ b/
yportenv_multi.h
@@
-1,8
+1,7
@@
/*
* YAFFS: Yet another Flash File System . A NAND-flash specific file system.
*
/*
* YAFFS: Yet another Flash File System . A NAND-flash specific file system.
*
- * Copyright (C) 2002-2011 Aleph One Ltd.
- * for Toby Churchill Ltd and Brightstar Engineering
+ * Copyright (C) 2002-2018 Aleph One Ltd.
*
* Created by Charles Manning <charles@aleph1.co.uk>
*
*
* Created by Charles Manning <charles@aleph1.co.uk>
*
@@
-62,10
+61,18
@@
#define YAFFS_LOSTNFOUND_MODE 0700
#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
#define YAFFS_LOSTNFOUND_MODE 0700
#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0))
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4,12,0))
#define Y_CURRENT_TIME CURRENT_TIME.tv_sec
#define Y_CURRENT_TIME CURRENT_TIME.tv_sec
+#else
+#define Y_CURRENT_TIME current_kernel_time().tv_sec
+#endif
#define Y_TIME_CONVERT(x) (x).tv_sec
#else
#define Y_TIME_CONVERT(x) (x).tv_sec
#else
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(4,12,0))
#define Y_CURRENT_TIME CURRENT_TIME
#define Y_CURRENT_TIME CURRENT_TIME
+#else
+#define Y_CURRENT_TIME current_kernel_time()
+#endif
#define Y_TIME_CONVERT(x) (x)
#endif
#define Y_TIME_CONVERT(x) (x)
#endif