Fix consumer to handle compat layer

[lttng-tools.git] / src / common / compat / fcntl.h

diff --git a/src/common/compat/fcntl.h b/src/common/compat/fcntl.h
index 575495fe55b3818a4aba8e5af3c41872aab91e74..420546959d1da1f1b1bf08485c833591e130b150 100644 (file)
--- a/src/common/compat/fcntl.h
+++ b/src/common/compat/fcntl.h
@@ -19,21 +19,19 @@
 #define _COMPAT_FCNTL_H
 
 #include <fcntl.h>
-#include <sys/types.h>
 
-#ifdef __linux__
-
-extern int compat_sync_file_range(int fd, off64_t offset, off64_t nbytes,
-               unsigned int flags);
 #define lttng_sync_file_range(fd, offset, nbytes, flags) \
        compat_sync_file_range(fd, offset, nbytes, flags)
 
-#elif __FreeBSD__
+#ifdef __linux__
 
-typedef long int off64_t;
-typedef off64_t loff_t;
+int compat_sync_file_range(int fd, off64_t offset, off64_t nbytes,
+               unsigned int flags)
+{
+       return sync_file_range(fd, offset, nbytes, flags);
+}
 
-#include <sys/errno.h>
+#elif __FreeBSD__
 
 /*
  * Possible flags under Linux. Simply nullify them and avoid wrapper.
@@ -42,6 +40,15 @@ typedef off64_t loff_t;
 #define SYNC_FILE_RANGE_WAIT_BEFORE   0
 #define SYNC_FILE_RANGE_WRITE         0
 
+typedef long int off64_t;
+typedef off64_t loff_t;
+
+int compat_sync_file_range(int fd, off64_t offset, off64_t nbytes,
+               unsigned int flags)
+{
+       return 0;
+}
+
 /*
  * Possible flags under Linux. Simply nullify them and avoid wrappers.
  */
@@ -50,21 +57,8 @@ typedef off64_t loff_t;
 #define SPLICE_F_MORE       0
 #define SPLICE_F_GIFT       0
 
-#define POSIX_FADV_DONTNEED 0
-
-static inline int lttng_sync_file_range(int fd, off64_t offset,
-               off64_t nbytes, unsigned int flags)
-{
-       return -ENOSYS;
-}
-
-static inline ssize_t splice(int fd_in, loff_t *off_in, int fd_out, loff_t *off_out,
-               size_t len, unsigned int flags)
-{
-       return -ENOSYS;
-}
-
-static inline int posix_fadvise(int fd, off_t offset, off_t len, int advice)
+ssize_t splice(int fd_in, loff_t *off_in, int fd_out,
+               loff_t *off_out, size_t len, unsigned int flags)
 {
        return -ENOSYS;
 }