This makes it easier to build f2fs-tools for Windows.
Signed-off-by: Bart Van Assche <bvanass...@acm.org>
---
lib/libf2fs.c | 10 +++++-----
lib/libf2fs_io.c | 6 +++---
lib/libf2fs_zoned.c | 2 +-
mkfs/f2fs_format.c | 2 +-
mkfs/f2fs_format_main.c | 2 +-
mkfs/f2fs_format_utils.c | 4 ++--
6 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/lib/libf2fs.c b/lib/libf2fs.c
index b0a892772de1..c7102528f2f4 100644
--- a/lib/libf2fs.c
+++ b/lib/libf2fs.c
@@ -22,7 +22,7 @@
#endif
#include <time.h>
#include <sys/stat.h>
-#ifndef ANDROID_WINDOWS_HOST
+#ifndef _WIN32
#include <sys/mount.h>
#include <sys/ioctl.h>
#endif
@@ -49,7 +49,7 @@
#define MODELINQUIRY 0x12,0x00,0x00,0x00,0x4A,0x00
#endif
-#ifndef ANDROID_WINDOWS_HOST /* O_BINARY is windows-specific flag */
+#ifndef _WIN32 /* O_BINARY is windows-specific flag */
#define O_BINARY 0
#else
/* On Windows, wchar_t is 8 bit sized and it causes compilation errors. */
@@ -606,7 +606,7 @@ int write_inode(struct f2fs_node *inode, u64 blkaddr)
*/
char *get_rootdev()
{
-#if defined(ANDROID_WINDOWS_HOST) || defined(WITH_ANDROID)
+#if defined(_WIN32) || defined(WITH_ANDROID)
return NULL;
#else
struct stat sb;
@@ -740,7 +740,7 @@ static int is_mounted(const char *mpt, const char *device)
int f2fs_dev_is_umounted(char *path)
{
-#ifdef ANDROID_WINDOWS_HOST
+#ifdef _WIN32
return 0;
#else
struct stat *st_buf;
@@ -872,7 +872,7 @@ void get_kernel_uname_version(__u8 *version)
#define BLKSSZGET DKIOCGETBLOCKCOUNT
#endif /* APPLE_DARWIN */
-#ifndef ANDROID_WINDOWS_HOST
+#ifndef _WIN32
static int open_check_fs(char *path, int flag)
{
if (c.func != DUMP && (c.func != FSCK || c.fix_on || c.auto_fix))
diff --git a/lib/libf2fs_io.c b/lib/libf2fs_io.c
index b985e6f37a0a..bf6dfe240bb7 100644
--- a/lib/libf2fs_io.c
+++ b/lib/libf2fs_io.c
@@ -23,7 +23,7 @@
#include <mntent.h>
#endif
#include <time.h>
-#ifndef ANDROID_WINDOWS_HOST
+#ifndef _WIN32
#include <sys/stat.h>
#include <sys/mount.h>
#include <sys/ioctl.h>
@@ -634,7 +634,7 @@ int dev_reada_block(__u64 blk_addr)
int f2fs_fsync_device(void)
{
-#ifndef ANDROID_WINDOWS_HOST
+#ifndef _WIN32
int i;
for (i = 0; i < c.ndevs; i++) {
@@ -783,7 +783,7 @@ int f2fs_finalize_device(void)
* in the block device page cache.
*/
for (i = 0; i < c.ndevs; i++) {
-#ifndef ANDROID_WINDOWS_HOST
+#ifndef _WIN32
ret = fsync(c.devices[i].fd);
if (ret < 0) {
MSG(0, "\tError: Could not conduct fsync!!!\n");
diff --git a/lib/libf2fs_zoned.c b/lib/libf2fs_zoned.c
index c408a4991fa1..cb954feabe61 100644
--- a/lib/libf2fs_zoned.c
+++ b/lib/libf2fs_zoned.c
@@ -22,7 +22,7 @@
#ifdef HAVE_LINUX_LIMITS_H
#include <linux/limits.h>
#endif
-#ifndef ANDROID_WINDOWS_HOST
+#ifndef _WIN32
#include <sys/ioctl.h>
#endif
#include <libgen.h>
diff --git a/mkfs/f2fs_format.c b/mkfs/f2fs_format.c
index 8bd33ac003c5..332abf60d0d9 100644
--- a/mkfs/f2fs_format.c
+++ b/mkfs/f2fs_format.c
@@ -13,7 +13,7 @@
#include <fcntl.h>
#include <string.h>
#include <unistd.h>
-#ifndef ANDROID_WINDOWS_HOST
+#ifndef _WIN32
#include <sys/stat.h>
#include <sys/mount.h>
#endif
diff --git a/mkfs/f2fs_format_main.c b/mkfs/f2fs_format_main.c
index d05d4e2cb4e5..ecc942b61d63 100644
--- a/mkfs/f2fs_format_main.c
+++ b/mkfs/f2fs_format_main.c
@@ -15,7 +15,7 @@
#include <stdbool.h>
#include <unistd.h>
#include <sys/stat.h>
-#ifndef ANDROID_WINDOWS_HOST
+#ifndef _WIN32
#include <sys/mount.h>
#endif
#include <time.h>
diff --git a/mkfs/f2fs_format_utils.c b/mkfs/f2fs_format_utils.c
index e84311ae1287..53101d1bd790 100644
--- a/mkfs/f2fs_format_utils.c
+++ b/mkfs/f2fs_format_utils.c
@@ -26,7 +26,7 @@
#include <unistd.h>
#include <stdlib.h>
#include <stdbool.h>
-#ifndef ANDROID_WINDOWS_HOST
+#ifndef _WIN32
#include <sys/ioctl.h>
#endif
#include <sys/stat.h>
@@ -48,7 +48,7 @@
static int trim_device(int i)
{
-#ifndef ANDROID_WINDOWS_HOST
+#ifndef _WIN32
unsigned long long range[2];
struct stat *stat_buf;
struct device_info *dev = c.devices + i;
_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
