We also need to declare info if the USERNAMES feature is enabled.
authorMatt Kraai <kraai@debian.org>
Sat, 28 Oct 2000 01:21:22 +0000 (01:21 -0000)
committerMatt Kraai <kraai@debian.org>
Sat, 28 Oct 2000 01:21:22 +0000 (01:21 -0000)
coreutils/ls.c
ls.c

index 4377256..b7329df 100644 (file)
@@ -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 4377256..b7329df 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