aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lib/ext2fs/ext2fsP.h6
-rw-r--r--lib/ext2fs/fileio.c1
-rw-r--r--misc/tune2fs.c10
3 files changed, 11 insertions, 6 deletions
diff --git a/lib/ext2fs/ext2fsP.h b/lib/ext2fs/ext2fsP.h
index 99c0c1ba..a88db93e 100644
--- a/lib/ext2fs/ext2fsP.h
+++ b/lib/ext2fs/ext2fsP.h
@@ -142,6 +142,6 @@ extern void ext2fs_warn_bitmap32(ext2fs_generic_bitmap bitmap,const char *func);
extern int ext2fs_mem_is_zero(const char *mem, size_t len);
-int ext2fs_file_block_offset_too_big(ext2_filsys fs,
- struct ext2_inode *inode,
- blk64_t offset);
+extern int ext2fs_file_block_offset_too_big(ext2_filsys fs,
+ struct ext2_inode *inode,
+ blk64_t offset);
diff --git a/lib/ext2fs/fileio.c b/lib/ext2fs/fileio.c
index 582b306a..77328042 100644
--- a/lib/ext2fs/fileio.c
+++ b/lib/ext2fs/fileio.c
@@ -18,6 +18,7 @@
#include "ext2_fs.h"
#include "ext2fs.h"
+#include "ext2fsP.h"
struct ext2_file {
errcode_t magic;
diff --git a/misc/tune2fs.c b/misc/tune2fs.c
index 3730821a..568fb30d 100644
--- a/misc/tune2fs.c
+++ b/misc/tune2fs.c
@@ -26,7 +26,6 @@
*/
#define _XOPEN_SOURCE 600 /* for inclusion of strptime() */
-#define _BSD_SOURCE /* for inclusion of strcasecmp() */
#include "config.h"
#include <fcntl.h>
#include <grp.h>
@@ -41,6 +40,11 @@ extern int optind;
#ifdef HAVE_STDLIB_H
#include <stdlib.h>
#endif
+#ifdef HAVE_STRINGS_H
+#include <strings.h> /* for strcasecmp() */
+#else
+#define _BSD_SOURCE /* for inclusion of strcasecmp() via <string.h> */
+#endif
#include <string.h>
#include <time.h>
#include <unistd.h>
@@ -765,6 +769,7 @@ static void handle_quota_options(ext2_filsys fs)
return;
}
+#ifdef CONFIG_QUOTA
static void parse_quota_opts(const char *opts)
{
char *buf, *token, *next, *p;
@@ -807,8 +812,7 @@ static void parse_quota_opts(const char *opts)
}
free(buf);
}
-
-
+#endif
static void parse_e2label_options(int argc, char ** argv)
{