openharmony/third_party_f2fs-tools
1
0
Fork 0
mirror of https://gitee.com/openharmony/third_party_f2fs-tools synced 2024-11-26 19:51:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change the ANDROID_WINDOWS_HOST macro into _WIN32

Browse Source 
commit f3033fbc8ab80a026740171cdbad44d8bd5fd882
category: bugfix
issue: #I6VAS0
CVE: NA

Signed-off-by: DongSenhao <dongsenhao2@huawei.com>
---------------------------------------

This makes it easier to build f2fs-tools for Windows.

Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: dongsenhao <dongsenhao2@huawei.com>
This commit is contained in:
Bart Van Assche 2022-04-21 15:18:12 -07:00 committed by dongsenhao
parent a8c6a6d93f
commit b85e86c3c0
7 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/f2fs_fs.h
View File

@ -68,7 +68,7 @@
# define UNUSED(x) x
#endif
#ifdef ANDROID_WINDOWS_HOST
#ifdef _WIN32
#undef HAVE_LINUX_TYPES_H
#endif

10
lib/libf2fs.c
View File

@ -24,7 +24,7 @@
#endif
#include <time.h>
#include <sys/stat.h>
#ifndef ANDROID_WINDOWS_HOST
#ifndef _WIN32
#include <sys/mount.h>
#include <sys/ioctl.h>
#endif
@ -51,7 +51,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. */
@ -608,7 +608,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;
@ -742,7 +742,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;
@ -874,7 +874,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))

6
lib/libf2fs_io.c
View File

@ -25,7 +25,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>
@ -636,7 +636,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++) {
@ -785,7 +785,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");

2
lib/libf2fs_zoned.c
View File

@ -24,7 +24,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>

2
mkfs/f2fs_format.c
View File

@ -15,7 +15,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

2
mkfs/f2fs_format_main.c
View File

@ -17,7 +17,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>

4
mkfs/f2fs_format_utils.c
View File

@ -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;