diff options
| author | Yann Collet <Cyan4973@users.noreply.github.com> | 2019-12-06 04:32:02 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-06 04:32:02 (GMT) |
| commit | 0f749838bf29bc0d1df428e23cf3dbb76ec4e9fc (patch) | |
| tree | b836887089e68e9edeee91e094886c3971f76fa2 | |
| parent | e3069dabcd99c9c34d1ff96a4217ea8f9436479d (diff) | |
| parent | 935b432be14bb97ddba14880640d69d98ea5ad57 (diff) | |
| download | lz4-0f749838bf29bc0d1df428e23cf3dbb76ec4e9fc.zip lz4-0f749838bf29bc0d1df428e23cf3dbb76ec4e9fc.tar.gz lz4-0f749838bf29bc0d1df428e23cf3dbb76ec4e9fc.tar.bz2 | |
Merge pull request #810 from korli/haiku
bring support for Haiku up to date.
| -rw-r--r-- | programs/lz4cli.c | 4 | ||||
| -rw-r--r-- | programs/platform.h | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/programs/lz4cli.c b/programs/lz4cli.c index e95050b..94f466f 100644 --- a/programs/lz4cli.c +++ b/programs/lz4cli.c @@ -658,7 +658,11 @@ int main(int argc, const char** argv) if (!output_filename) output_filename = stdoutmark; } else{ +#ifdef UTIL_HAS_CREATEFILELIST if (!recursive && !UTIL_isRegFile(input_filename)) { +#else + if (!UTIL_isRegFile(input_filename)) { +#endif DISPLAYLEVEL(1, "%s: is not a regular file \n", input_filename); exit(1); } diff --git a/programs/platform.h b/programs/platform.h index 7e2cb58..bdbcb3b 100644 --- a/programs/platform.h +++ b/programs/platform.h @@ -81,7 +81,8 @@ extern "C" { #if !defined(_WIN32) && (defined(__unix__) || defined(__unix) || (defined(__APPLE__) && defined(__MACH__)) /* UNIX-like OS */ \ || defined(__midipix__) || defined(__VMS)) # if (defined(__APPLE__) && defined(__MACH__)) || defined(__SVR4) || defined(_AIX) || defined(__hpux) /* POSIX.1–2001 (SUSv3) conformant */ \ - || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__MidnightBSD__) /* BSD distros */ + || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__MidnightBSD__) /* BSD distros */ \ + || defined(__HAIKU__) # define PLATFORM_POSIX_VERSION 200112L # else # if defined(__linux__) || defined(__linux) |