merge with 3.8.4b

2 files changed, 1 insertions, 2 deletions

diff --git a/src/df.c b/src/df.c
index 4cf419638..7774e2d39 100644
--- a/src/df.c
+++ b/src/df.c
@@ -51,7 +51,6 @@
 #include "system.h"
 #include "version.h"
 
-char *strstr ();
 char *xmalloc ();
 char *xstrdup ();
 void error ();
diff --git a/src/ls.c b/src/ls.c
index de6f5a30d..302c8ad4f 100644
--- a/src/ls.c
+++ b/src/ls.c
@@ -267,7 +267,7 @@ static int numeric_users;
 static int print_block_size;
 
 /* Nonzero means show file sizes in kilobytes instead of blocks
-   (the size of which is system-dependant).  -k */
+   (the size of which is system-dependent).  -k */
 
 static int kilobyte_blocks;