projects
/
project
/
make_ext4fs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make_ext4fs: Remove off64_t in favor of standard off_t
[project/make_ext4fs.git]
/
ext4_utils.h
diff --git
a/ext4_utils.h
b/ext4_utils.h
index
b6915bd
..
a5c1ae0
100644
(file)
--- a/
ext4_utils.h
+++ b/
ext4_utils.h
@@
-27,9
+27,12
@@
extern "C" {
#define _FILE_OFFSET_BITS 64
#define _LARGEFILE64_SOURCE 1
#include <sys/types.h>
#define _FILE_OFFSET_BITS 64
#define _LARGEFILE64_SOURCE 1
#include <sys/types.h>
-#include <unistd.h>
-#include <sys/types.h>
+#ifdef __GLIBC__
+#include <sys/sysmacros.h>
+#endif
+
+#include <unistd.h>
#include <errno.h>
#include <stdarg.h>
#include <stdio.h>
#include <errno.h>
#include <stdarg.h>
#include <stdio.h>
@@
-38,13
+41,6
@@
extern "C" {
#include <setjmp.h>
#include <stdint.h>
#include <setjmp.h>
#include <stdint.h>
-#if defined(__APPLE__) && defined(__MACH__)
-#define lseek64 lseek
-#define ftruncate64 ftruncate
-#define mmap64 mmap
-#define off64_t off_t
-#endif
-
#include "ext4_sb.h"
extern int force;
#include "ext4_sb.h"
extern int force;
@@
-150,13
+146,13
@@
u64 parse_num(const char *arg);
void ext4_parse_sb_info(struct ext4_super_block *sb);
u16 ext4_crc16(u16 crc_in, const void *buf, int size);
void ext4_parse_sb_info(struct ext4_super_block *sb);
u16 ext4_crc16(u16 crc_in, const void *buf, int size);
-typedef
void
(*fs_config_func_t)(const char *path, int dir, unsigned *uid, unsigned *gid,
+typedef
int
(*fs_config_func_t)(const char *path, int dir, unsigned *uid, unsigned *gid,
unsigned *mode, uint64_t *capabilities);
struct selabel_handle;
int make_ext4fs_internal(int fd, const char *directory,
unsigned *mode, uint64_t *capabilities);
struct selabel_handle;
int make_ext4fs_internal(int fd, const char *directory,
-
const char *mountpoint,
fs_config_func_t fs_config_func, int gzip,
+ fs_config_func_t fs_config_func, int gzip,
int sparse, int crc, int wipe,
int verbose, time_t fixed_time,
FILE* block_list_file);
int sparse, int crc, int wipe,
int verbose, time_t fixed_time,
FILE* block_list_file);