diff options
| author | Ron Yorston <rmy@pobox.com> | 2019-03-12 14:41:49 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2019-03-12 14:41:49 +0000 |
| commit | 0a058590010129557bdb9abd26d338297a21f10e (patch) | |
| tree | 92a127d160a30824d2f9f191c8481d15e82e5984 /editors | |
| parent | fd0e6a01a68047e959ef13f3161ce302b438d2b1 (diff) | |
| download | busybox-w32-0a058590010129557bdb9abd26d338297a21f10e.tar.gz busybox-w32-0a058590010129557bdb9abd26d338297a21f10e.tar.bz2 busybox-w32-0a058590010129557bdb9abd26d338297a21f10e.zip | |
win32: fix POSIX build (again)
Some faulty logic with ENABLE_FEATURE_EXTRA_FILE_DATA broke the
POSIX build.
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/diff.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/editors/diff.c b/editors/diff.c index 308d9782b..cf531460f 100644 --- a/editors/diff.c +++ b/editors/diff.c | |||
| @@ -1041,8 +1041,10 @@ int diff_main(int argc UNUSED_PARAM, char **argv) | |||
| 1041 | */ | 1041 | */ |
| 1042 | if (ENABLE_DESKTOP | 1042 | if (ENABLE_DESKTOP |
| 1043 | && (ENABLE_PLATFORM_POSIX || ENABLE_FEATURE_EXTRA_FILE_DATA) | 1043 | && (ENABLE_PLATFORM_POSIX || ENABLE_FEATURE_EXTRA_FILE_DATA) |
| 1044 | #if ENABLE_FEATURE_EXTRA_FILE_DATA | ||
| 1044 | /* ignore invalid inode numbers */ | 1045 | /* ignore invalid inode numbers */ |
| 1045 | && (ENABLE_FEATURE_EXTRA_FILE_DATA && stb[0].st_ino != 0) | 1046 | && stb[0].st_ino != 0 |
| 1047 | #endif | ||
| 1046 | && stb[0].st_ino == stb[1].st_ino | 1048 | && stb[0].st_ino == stb[1].st_ino |
| 1047 | && stb[0].st_dev == stb[1].st_dev | 1049 | && stb[0].st_dev == stb[1].st_dev |
| 1048 | && stb[0].st_size == stb[1].st_size | 1050 | && stb[0].st_size == stb[1].st_size |