Change string concats to work with all OSs

[yaffs2.git] / yportenv.h

diff --git a/yportenv.h b/yportenv.h
index 6cd90da756165b417a3f937eada2b59392e619db..ae2c5b6ecfe133b92554fecd0c204f0bf40dafad 100644 (file)
--- a/yportenv.h
+++ b/yportenv.h
@@ -51,6 +51,7 @@
 #define YCHAR char
 #define YUCHAR unsigned char
 #define _Y(x)     x
 #define YCHAR char
 #define YUCHAR unsigned char
 #define _Y(x)     x

+#define yaffs_strcat(a,b)    strcat(a,b)

 #define yaffs_strcpy(a,b)    strcpy(a,b)
 #define yaffs_strncpy(a,b,c) strncpy(a,b,c)
 #define yaffs_strncmp(a,b,c) strncmp(a,b,c)
 #define yaffs_strcpy(a,b)    strcpy(a,b)
 #define yaffs_strncpy(a,b,c) strncpy(a,b,c)
 #define yaffs_strncmp(a,b,c) strncmp(a,b,c)


@@ -64,7 +65,7 @@
 #define YAFFS_LOSTNFOUND_PREFIX                "obj"
 
 /* #define YPRINTF(x) printk x */
 #define YAFFS_LOSTNFOUND_PREFIX                "obj"
 
 /* #define YPRINTF(x) printk x */

-#define YMALLOC(x) kmalloc(x,GFP_KERNEL)
+#define YMALLOC(x) kmalloc(x,GFP_NOFS)

 #define YFREE(x)   kfree(x)
 #define YMALLOC_ALT(x) vmalloc(x)
 #define YFREE_ALT(x)   vfree(x)
 #define YFREE(x)   kfree(x)
 #define YMALLOC_ALT(x) vmalloc(x)
 #define YFREE_ALT(x)   vfree(x)


@@ -89,6 +90,7 @@
 
 #define TENDSTR "\n"
 #define TSTR(x) KERN_WARNING x
 
 #define TENDSTR "\n"
 #define TSTR(x) KERN_WARNING x

+#define TCONT(x) x

 #define TOUT(p) printk p
 
 #define yaffs_trace(mask, fmt, args...) \
 #define TOUT(p) printk p
 
 #define yaffs_trace(mask, fmt, args...) \


@@ -124,6 +126,7 @@
 #define YCHAR char
 #define YUCHAR unsigned char
 #define _Y(x)     x
 #define YCHAR char
 #define YUCHAR unsigned char
 #define _Y(x)     x

+#define yaffs_strcat(a,b)    strcat(a,b)

 #define yaffs_strcpy(a,b)    strcpy(a,b)
 #define yaffs_strncpy(a,b,c) strncpy(a,b,c)
 #define yaffs_strlen(s)             strlen(s)
 #define yaffs_strcpy(a,b)    strcpy(a,b)
 #define yaffs_strncpy(a,b,c) strncpy(a,b,c)
 #define yaffs_strlen(s)             strlen(s)


@@ -193,8 +196,8 @@ extern unsigned int yaffs_wr_attempts;
 
 #define T(mask,p) do{ if((mask) & (yaffs_traceMask | YAFFS_TRACE_ALWAYS)) TOUT(p);} while(0)
 
 
 #define T(mask,p) do{ if((mask) & (yaffs_traceMask | YAFFS_TRACE_ALWAYS)) TOUT(p);} while(0)
 

-#ifndef CONFIG_YAFFS_WINCE
-#define YBUG() T(YAFFS_TRACE_BUG,(TSTR("==>> yaffs bug: " __FILE__ " %d" TENDSTR),__LINE__))
+#ifndef YBUG
+#define YBUG() do {T(YAFFS_TRACE_BUG,(TSTR("==>> yaffs bug: " __FILE__ " %d" TENDSTR),__LINE__));} while(0)

 #endif
 
 #endif
 #endif
 
 #endif