Merge branch 'time_upgrade'

[yaffs2.git] / direct / ydirectenv.h

diff --git a/direct/ydirectenv.h b/direct/ydirectenv.h
index 332c10eaf5d721fcf05a9bd5a4b5c65876f7e7b2..08fc04d3812a9cb1276479a046d943f32d3820a3 100644 (file)
--- a/direct/ydirectenv.h
+++ b/direct/ydirectenv.h
@@ -29,6 +29,11 @@ void yaffs_bug_fn(const char *file_name, int line_no);
 
 #define BUG() do { yaffs_bug_fn(__FILE__, __LINE__); } while (0)
 
+#ifdef YAFFS_USE_32_BIT_TIME_T
+       #define YTIME_T u32
+#else
+       #define YTIME_T u64
+#endif
 
 #define YCHAR char
 #define YUCHAR unsigned char
@@ -74,13 +79,13 @@ size_t strnlen(const char *s, size_t maxlen);
 #define cond_resched()  do {} while (0)
 
 #ifdef CONFIG_YAFFS_NO_TRACE
+#define yaffs_trace(...) do { } while (0)
+#else
 #define yaffs_trace(msk, fmt, ...) do { \
        if (yaffs_trace_mask & (msk)) \
                printf("yaffs: " fmt "\n", ##__VA_ARGS__); \
 } while (0)
 
-#else
-#define yaffs_trace(...) do { } while (0)
 #endif
 
 #define YAFFS_LOSTNFOUND_NAME          "lost+found"