ChangeLog, main.c, resize2fs.h:

  resize2fs.h: Remove unneeded #include of linux/fs.h
  main.c: Fix gcc -Wall bug.  main() should return an int.

diff --git a/resize/ChangeLog b/resize/ChangeLog
index 15490d2..ff00270 100644 (file)
--- a/resize/ChangeLog
+++ b/resize/ChangeLog
@@ -1,3 +1,9 @@
+2000-02-02  Theodore Ts'o  <tytso@valinux.com>
+
+       * resize2fs.h: Remove unneeded #include of linux/fs.h
+
+       * main.c: Fix gcc -Wall bug.  main() should return an int.
+
 1999-11-19    <tytso@valinux.com>
 
        * Makefile.in (distclean): Remove TAGS and Makefile.in.old from

diff --git a/resize/main.c b/resize/main.c
index 11a2267..77fac23 100644 (file)
--- a/resize/main.c
+++ b/resize/main.c
@@ -130,7 +130,7 @@ static void check_expire_time(const char *progname)
        
 
 
-void main (int argc, char ** argv)
+int main (int argc, char ** argv)
 {
        errcode_t       retval;
        ext2_filsys     fs;
@@ -283,5 +283,5 @@ void main (int argc, char ** argv)
        }
        printf("The filesystem on %s is now %d blocks long.\n\n",
               device_name, new_size);
-       exit (0);
+       return (0);
 }

diff --git a/resize/resize2fs.h b/resize/resize2fs.h
index e9919cf..d128338 100644 (file)
--- a/resize/resize2fs.h
+++ b/resize/resize2fs.h
@@ -24,10 +24,6 @@
 #include <errno.h>
 #endif
 
-#ifdef HAVE_LINUX_FS_H
-#include <linux/fs.h>
-#endif
-
 #if EXT2_FLAT_INCLUDES
 #include "ext2_fs.h"
 #include "ext2fs.h"