From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.sourceforge.net (lists.sourceforge.net [216.105.38.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3256BC433F5 for ; Fri, 22 Apr 2022 17:53:45 +0000 (UTC) Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.94.2) (envelope-from ) id 1nhxTT-0005g2-Pj; Fri, 22 Apr 2022 17:53:43 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nhxTS-0005fw-HQ for linux-f2fs-devel@lists.sourceforge.net; Fri, 22 Apr 2022 17:53:41 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=In-Reply-To:Content-Type:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=DBDxWn9cq4mRCJrbIn1LiKKvu//YkCVwqJ+pS6TwtZ0=; b=PQDjrpcz6xOfQKR+zUhigQPjdt yeZkUw5CGXWJu34lNccIIAYy9wgsulDvZBWOxTUMMMncYhFcRj4tvsLOFiKy94e/8swqPcFCTozuB oYqqsnhqi/iNNqY4BQ4zQIsWgcypwtEPgUOyI7hiPu+tDMKgmIqXbfXSAERXlbF5Osps=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=In-Reply-To:Content-Type:MIME-Version:References:Message-ID:Subject:Cc:To :From:Date:Sender:Reply-To:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=DBDxWn9cq4mRCJrbIn1LiKKvu//YkCVwqJ+pS6TwtZ0=; b=eE62DJkFUro9qI5rnTkTwnrTFM ksHPEMkW77Fay8sSErYXUdHjTAXn45bORwTDDeysYqGh45ccFda+f5m8roxnDNlC5e3W7Xr0fa7HI 5AM/WMCsr5mbnDbUgL6ja+8jvGQRgcQkZfvArN3EgjLIVv9AzuEx7YEQRjJGnhqlWFjQ=; Received: from ams.source.kernel.org ([145.40.68.75]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.94.2) id 1nhxTP-0007Qp-Da for linux-f2fs-devel@lists.sourceforge.net; Fri, 22 Apr 2022 17:53:41 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id E42E1B831B9; Fri, 22 Apr 2022 17:53:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6D1B2C385A4; Fri, 22 Apr 2022 17:53:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1650650011; bh=gkp6DNyw2iHYqYUFBECtTfXkL7Au8rcuyhUw8+hZ+zc=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=JxDRF+mkF5po/ooXps/4TpeIlkQj4QSy+qlv/d2bS7Ff7Ql4INXVrCXeanHTNdw4N lUCIUeQfwEkQr1ztjBTzZjLe6A7GdHcktvesfHk5u6wmw7ZCMA3sdXBzA+k4C57dsm k3h7rXA7GhAIu4qtvhn+rJu2RFCnfL/qIx96Ve6hXMVhX631PYGXRKZJ3yi3SfIl73 6sSLaEc6UaJTdl0CPZ7oPhiE12eukIuQ22nJBCGUVgYxpjuzY6JOfiYhOQmVsbznEq eZZj9BnN3FuxyGGyO2MDwcWkfOr0IH05fvktLob1KKXjTVGYXqJOzSt/3TitSd2VEQ qDbYEyaNnOmAg== Date: Fri, 22 Apr 2022 10:53:29 -0700 From: Jaegeuk Kim To: Bart Van Assche Message-ID: References: <20220421221836.3935616-1-bvanassche@acm.org> <20220421221836.3935616-8-bvanassche@acm.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20220421221836.3935616-8-bvanassche@acm.org> X-Headers-End: 1nhxTP-0007Qp-Da Subject: Re: [f2fs-dev] [PATCH 07/31] Change the ANDROID_WINDOWS_HOST macro into _WIN32 X-BeenThere: linux-f2fs-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-f2fs-devel@lists.sourceforge.net Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net Fixed a missing resolution from [PATCH 06/31]. In include/f2fs_fs.h, 71 #ifdef ANDROID_WINDOWS_HOST 72 #undef HAVE_LINUX_TYPES_H 73 #endif On 04/21, Bart Van Assche wrote: > This makes it easier to build f2fs-tools for Windows. > > Signed-off-by: Bart Van Assche > --- > 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 > #include > -#ifndef ANDROID_WINDOWS_HOST > +#ifndef _WIN32 > #include > #include > #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 > #endif > #include > -#ifndef ANDROID_WINDOWS_HOST > +#ifndef _WIN32 > #include > #include > #include > @@ -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 > #endif > -#ifndef ANDROID_WINDOWS_HOST > +#ifndef _WIN32 > #include > #endif > #include > 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 > #include > #include > -#ifndef ANDROID_WINDOWS_HOST > +#ifndef _WIN32 > #include > #include > #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 > #include > #include > -#ifndef ANDROID_WINDOWS_HOST > +#ifndef _WIN32 > #include > #endif > #include > 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 > #include > #include > -#ifndef ANDROID_WINDOWS_HOST > +#ifndef _WIN32 > #include > #endif > #include > @@ -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