X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_guts.h;h=307eba28676f5c2360668c64c2477c8804624edc;hp=60770ca7e10040e0f7da693ad833726586454433;hb=2870702e0b0f4342857222a36ffcb21886c7f4bf;hpb=3ecea787c3d99a5e13bf3b826dd3ad772fbad810

diff --git a/yaffs_guts.h b/yaffs_guts.h
index 60770ca..307eba2 100644
--- a/yaffs_guts.h
+++ b/yaffs_guts.h
@@ -422,7 +422,7 @@ struct yaffs_obj {
 
 	u32 yst_mode;
 
-#ifdef CONFIG_YAFFS_SHORT_NAMES_IN_RAM
+#ifndef CONFIG_YAFFS_NO_SHORT_NAMES
 	YCHAR short_name[YAFFS_SHORT_NAME_LENGTH + 1];
 #endif
 
@@ -911,4 +911,5 @@ struct yaffs_tnode *yaffs_find_tnode_0(struct yaffs_dev *dev,
 u32 yaffs_get_group_base(struct yaffs_dev *dev, struct yaffs_tnode *tn,
 			 unsigned pos);
 
+int yaffs_is_non_empty_dir(struct yaffs_obj *obj);
 #endif