We also need to declare info if the USERNAMES feature is enabled.

diff --git a/coreutils/ls.c b/coreutils/ls.c
index 4377256f641d73bcdb07026d944a458bc31becc3..b7329dfdf1f54498b49a283e93a119fc8114a44f 100644 (file)
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -433,7 +433,7 @@ void showdirs(struct dnode **dn, int ndirs)
 {
        int i, nfiles;
        struct dnode **subdnp;
-#ifdef BB_FEATURE_LS_SORTFILES
+#ifdef BB_FEATURE_LS_RECURSIVE
        int dndirs;
        struct dnode **dnd;
 #endif
@@ -529,8 +529,10 @@ int list_single(struct dnode *dn)
        char *filetime;
        time_t ttime, age;
 #endif
-#ifdef BB_FEATURE_LS_FILETYPES
+#if defined (BB_FEATURE_LS_FILETYPES) || defined (BB_FEATURE_LS_USERNAME)
        struct stat info;
+#endif
+#ifdef BB_FEATURE_LS_FILETYPES
        char append;
 #endif
 

diff --git a/ls.c b/ls.c
index 4377256f641d73bcdb07026d944a458bc31becc3..b7329dfdf1f54498b49a283e93a119fc8114a44f 100644 (file)
--- a/ls.c
+++ b/ls.c
@@ -433,7 +433,7 @@ void showdirs(struct dnode **dn, int ndirs)
 {
        int i, nfiles;
        struct dnode **subdnp;
-#ifdef BB_FEATURE_LS_SORTFILES
+#ifdef BB_FEATURE_LS_RECURSIVE
        int dndirs;
        struct dnode **dnd;
 #endif
@@ -529,8 +529,10 @@ int list_single(struct dnode *dn)
        char *filetime;
        time_t ttime, age;
 #endif
-#ifdef BB_FEATURE_LS_FILETYPES
+#if defined (BB_FEATURE_LS_FILETYPES) || defined (BB_FEATURE_LS_USERNAME)
        struct stat info;
+#endif
+#ifdef BB_FEATURE_LS_FILETYPES
        char append;
 #endif