X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fcompat%2Ffcntl.hpp;h=ba8f05a95c4e1fb046ca41ce94835792da0e4e18;hb=28f23191dcbf047429d51950a337a57d7a3f866a;hp=a526ca55d4326791e6a2177bcff51e76baf223c0;hpb=c9e313bc594f40a86eed237dce222c0fc99c957f;p=lttng-tools.git

diff --git a/src/common/compat/fcntl.hpp b/src/common/compat/fcntl.hpp
index a526ca55d..ba8f05a95 100644
--- a/src/common/compat/fcntl.hpp
+++ b/src/common/compat/fcntl.hpp
@@ -8,22 +8,20 @@
 #ifndef _COMPAT_FCNTL_H
 #define _COMPAT_FCNTL_H
 
+#include <common/compat/errno.hpp>
+
 #include <fcntl.h>
 #include <sys/types.h>
 
-#include <common/compat/errno.hpp>
-
-#if (defined(__CYGWIN__))
-typedef long long off64_t;
-#endif
+static_assert(sizeof(off_t) == sizeof(int64_t),
+	      "Build system is misconfigured, off_t must be 64-bit wide");
 
 #if (defined(__FreeBSD__) || defined(__sun__))
 typedef off64_t loff_t;
 #endif
 
 #ifdef __linux__
-extern int compat_sync_file_range(int fd, off64_t offset, off64_t nbytes,
-		unsigned int flags);
+extern int compat_sync_file_range(int fd, off_t offset, off_t nbytes, unsigned int flags);
 #define lttng_sync_file_range(fd, offset, nbytes, flags) \
 	compat_sync_file_range(fd, offset, nbytes, flags)
 
@@ -33,15 +31,14 @@ extern int compat_sync_file_range(int fd, off64_t offset, off64_t nbytes,
 /*
  * Possible flags under Linux. Simply nullify them and avoid wrapper.
  */
-#define SYNC_FILE_RANGE_WAIT_AFTER    0
-#define SYNC_FILE_RANGE_WAIT_BEFORE   0
-#define SYNC_FILE_RANGE_WRITE         0
+#define SYNC_FILE_RANGE_WAIT_AFTER  0
+#define SYNC_FILE_RANGE_WAIT_BEFORE 0
+#define SYNC_FILE_RANGE_WRITE	    0
 
-static inline int lttng_sync_file_range(
-		int fd __attribute__((unused)),
-		off64_t offset __attribute__((unused)),
-		off64_t nbytes __attribute__((unused)),
-		unsigned int flags __attribute__((unused)))
+static inline int lttng_sync_file_range(int fd __attribute__((unused)),
+					off_t offset __attribute__((unused)),
+					off_t nbytes __attribute__((unused)),
+					unsigned int flags __attribute__((unused)))
 {
 	return -ENOSYS;
 }
@@ -51,24 +48,24 @@ static inline int lttng_sync_file_range(
 /*
  * Possible flags under Linux. Simply nullify them and avoid wrappers.
  */
-#define SPLICE_F_MOVE       0
-#define SPLICE_F_NONBLOCK   0
-#define SPLICE_F_MORE       0
-#define SPLICE_F_GIFT       0
+#define SPLICE_F_MOVE	  0
+#define SPLICE_F_NONBLOCK 0
+#define SPLICE_F_MORE	  0
+#define SPLICE_F_GIFT	  0
 
-static inline ssize_t splice(
-		int fd_in __attribute__((unused)),
-		loff_t *off_in __attribute__((unused)),
-		int fd_out __attribute__((unused)),
-		loff_t *off_out __attribute__((unused)),
-		size_t len __attribute__((unused)),
-		unsigned int flags __attribute__((unused)))
+static inline ssize_t splice(int fd_in __attribute__((unused)),
+			     loff_t *off_in __attribute__((unused)),
+			     int fd_out __attribute__((unused)),
+			     loff_t *off_out __attribute__((unused)),
+			     size_t len __attribute__((unused)),
+			     unsigned int flags __attribute__((unused)))
 {
 	return -ENOSYS;
 }
 #endif
 
-#if !(defined(__linux__) || defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__sun__) || defined(__APPLE__))
+#if !(defined(__linux__) || defined(__FreeBSD__) || defined(__CYGWIN__) || defined(__sun__) || \
+      defined(__APPLE__))
 #error "Please add support for your OS."
 #endif /* __linux__ , __FreeBSD__, __CYGWIN__, __sun__, __APPLE__ */