X-Git-Url: http://aleph1.co.uk/gitweb/?a=blobdiff_plain;f=direct%2Fydirectenv.h;h=7063fa649fb25b4e0329ae9ff43925d45bc0d86b;hb=a8e8fa708152c823e534b7b004bfbd121dd1670e;hp=d394c6e688a2e87d0c508969e34aec4dbaddcb61;hpb=79d0e028d5b777b2e4cf55d96b737cb024988abe;p=yaffs2.git

diff --git a/direct/ydirectenv.h b/direct/ydirectenv.h
index d394c6e..7063fa6 100644
--- a/direct/ydirectenv.h
+++ b/direct/ydirectenv.h
@@ -47,10 +47,10 @@ void yaffs_qsort(void *aa, size_t n, size_t es,
         
 #define YAFFS_PATH_DIVIDERS  "/"
 
-#ifdef NO_Y_INLINE
-#define Y_INLINE
+#ifdef NO_inline
+#define inline
 #else
-#define Y_INLINE __inline__
+#define inline __inline__
 #endif
 
 #define kmalloc(x,flags) yaffs_malloc(x)
@@ -61,7 +61,7 @@ void yaffs_qsort(void *aa, size_t n, size_t es,
 #define cond_resched()  do {} while(0)
 
 #define yaffs_trace(msk, fmt, ...) do { \
-	if(yaffs_trace_mask & ((msk) | YAFFS_TRACE_ALWAYS)) \
+	if(yaffs_trace_mask & (msk)) \
 		printf("yaffs: " fmt "\n", ##__VA_ARGS__); \
 } while(0)