diff options
| author | Adrien Schildknecht <adriens@google.com> | 2016-11-23 10:21:42 -0800 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2017-05-23 22:47:23 -0400 |
| commit | f47f3195857867f18a781df317c833a3e97300c4 (patch) | |
| tree | 891f6f03298f1e73dda46c5d2115c9c2c92f4918 /util/android_config.h | |
| parent | 43f927f7aa259c1deca0ec5855b1e5d23cb7f9e0 (diff) | |
| download | e2fsprogs-f47f3195857867f18a781df317c833a3e97300c4.tar.gz | |
AOSP: android: libext2fs and com_err for windows
Test: m libext2fs-host && m libext2_com_err-host
Change-Id: I92b6717b617a4f7f16182bf12af58cb22f20fa8f
From AOSP commit: 1538eb4c580d53657f82e4e0170ca5ad5b67455c
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'util/android_config.h')
| -rw-r--r-- | util/android_config.h | 72 |
1 files changed, 37 insertions, 35 deletions
diff --git a/util/android_config.h b/util/android_config.h index bcf81229..9b09ce6b 100644 --- a/util/android_config.h +++ b/util/android_config.h @@ -9,33 +9,11 @@ #define DISABLE_BACKTRACE 1 #define HAVE_DIRENT_H 1 #define HAVE_ERRNO_H 1 -#define HAVE_EXT2_IOCTLS 1 -#define HAVE_FALLOCATE 1 #define HAVE_GETOPT_H 1 -#define HAVE_GETPAGESIZE 1 #define HAVE_GETPWUID_R 1 #define HAVE_INTPTR_T 1 #define HAVE_INTTYPES_H 1 -#ifdef __linux__ -#define HAVE_LINUX_FD_H 1 -#define HAVE_LSEEK64 1 -#define HAVE_LSEEK64_PROTOTYPE 1 -#endif #define HAVE_MMAP 1 -#ifdef __linux__ -#define HAVE_MNTENT_H 1 -#endif -#define HAVE_NETINET_IN_H 1 -#define HAVE_NET_IF_H 1 -#define HAVE_POSIX_MEMALIGN 1 -#define HAVE_PREAD 1 -#ifdef __linux__ -#define HAVE_PREAD64 1 -#endif -#define HAVE_PWRITE 1 -#ifdef __linux__ -#define HAVE_PWRITE64 1 -#endif #define HAVE_SETJMP_H 1 #ifdef __linux__ #define HAVE_SETMNTENT 1 @@ -48,19 +26,43 @@ #define HAVE_STRNLEN 1 #define HAVE_STRPTIME 1 #define HAVE_SYSCONF 1 -#define HAVE_SYS_IOCTL_H 1 -#define HAVE_SYS_MMAN_H 1 -#define HAVE_SYS_MOUNT_H 1 -#define HAVE_SYS_PARAM_H 1 -#ifdef __linux__ -#define HAVE_SYS_PRCTL_H 1 -#endif -#define HAVE_SYS_RESOURCE_H 1 -#define HAVE_SYS_SELECT_H 1 -#define HAVE_SYS_STAT_H 1 -#define HAVE_SYS_TIME_H 1 -#define HAVE_SYS_TYPES_H 1 -#define HAVE_SYS_WAIT_H 1 #define HAVE_TYPE_SSIZE_T 1 #define HAVE_UNISTD_H 1 #define HAVE_UTIME_H 1 + +#define HAVE_SYS_STAT_H 1 +#define HAVE_SYS_TIME_H 1 +#define HAVE_SYS_TYPES_H 1 + +#if defined(_WIN32) +# define HAVE_LINUX_TYPES_H 1 +# define HAVE_WINSOCK_H 1 +#endif +#if defined(__APPLE__) || defined(__linux__) +# define HAVE_FCNTL 1 +# define HAVE_FSYNC 1 +# define HAVE_GETPAGESIZE 1 +# define HAVE_NET_IF_H 1 +# define HAVE_NETINET_IN_H 1 +# define HAVE_PREAD 1 +# define HAVE_PWRITE 1 +# define HAVE_POSIX_MEMALIGN 1 +# define HAVE_SYS_IOCTL_H 1 +# define HAVE_SYS_MMAN_H 1 +# define HAVE_SYS_MOUNT_H 1 +# define HAVE_SYS_PARAM_H 1 +# define HAVE_SYS_RESOURCE_H 1 +# define HAVE_SYS_SELECT_H 1 +# define HAVE_SYS_WAIT_H 1 +#endif +#if defined(__linux__) +# define HAVE_EXT2_IOCTLS 1 +# define HAVE_FALLOCATE 1 +# define HAVE_LINUX_FD_H 1 +# define HAVE_LINUX_TYPES_H 1 +# define HAVE_LSEEK64 1 +# define HAVE_LSEEK64_PROTOTYPE 1 +# define HAVE_PREAD64 1 +# define HAVE_PWRITE64 1 +# define HAVE_SYS_PRCTL_H 1 +#endif |