Skip to content

G
git2
Unverified Commit d65edcdc by Edward Thomson Committed by GitHub
Options

Merge pull request #5628 from interkosmos/master 

Fixed includes for FreeBSD
parents 1e987525 6887e9db
Showing with 2 additions and 2 deletions
tests/clar/fs.h
...@@ -273,7 +273,7 @@ cl_fs_cleanup(void) ...@@ -273,7 +273,7 @@ cl_fs_cleanup(void)
# include <sys/sendfile.h> # include <sys/sendfile.h>
#endif #endif
#if defined(__APPLE__) || defined(__FreeBSD__) #if defined(__APPLE__)
# include <copyfile.h> # include <copyfile.h>
#endif #endif
...@@ -356,7 +356,7 @@ fs_copyfile_helper(const char *source, size_t source_len, const char *dest, int ...@@ -356,7 +356,7 @@ fs_copyfile_helper(const char *source, size_t source_len, const char *dest, int
cl_must_pass((in = open(source, O_RDONLY))); cl_must_pass((in = open(source, O_RDONLY)));
cl_must_pass((out = open(dest, O_WRONLY|O_CREAT|O_TRUNC, dest_mode))); cl_must_pass((out = open(dest, O_WRONLY|O_CREAT|O_TRUNC, dest_mode)));
#if USE_FCOPYFILE && (defined(__APPLE__) || defined(__FreeBSD__)) #if USE_FCOPYFILE && defined(__APPLE__)
((void)(source_len)); /* unused */ ((void)(source_len)); /* unused */
cl_must_pass(fcopyfile(in, out, 0, COPYFILE_DATA)); cl_must_pass(fcopyfile(in, out, 0, COPYFILE_DATA));
#elif USE_SENDFILE && defined(__linux__) #elif USE_SENDFILE && defined(__linux__)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment