Merge branch 'busybox' into merge

1 files changed, 6 insertions, 15 deletions

diff --git a/e2fsprogs/e2fs_lib.h b/e2fsprogs/e2fs_lib.h
index 4a4d4cc27..aa92e63af 100644
--- a/e2fsprogs/e2fs_lib.h
+++ b/e2fsprogs/e2fs_lib.h
@@ -11,25 +11,16 @@
 
 PUSH_AND_SET_FUNCTION_VISIBILITY_TO_HIDDEN
 
-/* Iterate a function on each entry of a directory */
-int iterate_on_dir(const char *dir_name,
-                int FAST_FUNC (*func)(const char *, struct dirent *, void *),
-                void *private);
-
-/* Get/set a file version on an ext2 file system */
-int fgetsetversion(const char *name, unsigned long *get_version, unsigned long set_version);
-#define fgetversion(name, version) fgetsetversion(name, version, 0)
-#define fsetversion(name, version) fgetsetversion(name, NULL, version)
-
-/* Get/set a file flags on an ext2 file system */
-int fgetsetflags(const char *name, unsigned long *get_flags, unsigned long set_flags);
+#if ENABLE_PLATFORM_MINGW32
+/* Get/set a file flags */
+int fgetsetflags(const char *name, unsigned *get_flags, unsigned set_flags);
 #define fgetflags(name, flags) fgetsetflags(name, flags, 0)
 #define fsetflags(name, flags) fgetsetflags(name, NULL, flags)
+#endif
 
-/* Must be 1 for compatibility with 'int long_format'. */
-#define PFOPT_LONG  1
 /* Print file attributes on an ext2 file system */
-void print_e2flags(FILE *f, unsigned long flags, unsigned options);
+void print_e2flags_long(unsigned flags);
+void print_e2flags(unsigned flags);
 
 extern const uint32_t e2attr_flags_value[];
 extern const char e2attr_flags_sname[];