Use compiler-agnostic defines to silence warning

[lttng-tools.git] / tests / unit / test_unix_socket.cpp

diff --git a/tests/unit/test_unix_socket.cpp b/tests/unit/test_unix_socket.cpp
index 2c23b669c2d800bf35e7b528b0e346f3bc0ef1a5..95a6173b8e75a15d9183348b34d2f350e10b1f09 100644 (file)
--- a/tests/unit/test_unix_socket.cpp
+++ b/tests/unit/test_unix_socket.cpp
@@ -5,7 +5,6 @@
  *
  */
 
-#include <common/compat/fcntl.hpp>
 #include <common/defaults.hpp>
 #include <common/error.hpp>
 #include <common/payload-view.hpp>
@@ -17,6 +16,7 @@
 #include <lttng/constant.h>
 
 #include <algorithm>
+#include <fcntl.h>
 #include <pthread.h>
 #include <stdbool.h>
 #include <stdio.h>
@@ -27,7 +27,7 @@
 
 #define HIGH_FD_COUNT          LTTCOMM_MAX_SEND_FDS
 #define MESSAGE_COUNT          4
-#define LARGE_PAYLOAD_SIZE     4 * 1024
+#define LARGE_PAYLOAD_SIZE     (4 * 1024)
 #define LARGE_PAYLOAD_RECV_SIZE 100
 
 static const int TEST_COUNT = 37;
@@ -70,7 +70,7 @@ static void test_high_fd_count(unsigned int fd_count)
 
        for (i = 0; i < fd_count; i++) {
                struct fd_handle *handle;
-               int fd = fcntl(STDOUT_FILENO, F_DUPFD, 0);
+               const int fd = fcntl(STDOUT_FILENO, F_DUPFD, 0);
 
                if (fd < 0) {
                        PERROR("Failed to create fd while creating test payload");
@@ -486,7 +486,7 @@ error:
        lttng_payload_reset(&received_payload);
 }
 
-static void test_creds_passing(void)
+static void test_creds_passing()
 {
        pid_t fork_ret = -1;
        int ret, parent_socket = -1, child_connection_socket = -1;
@@ -651,7 +651,7 @@ error:
        }
 }
 
-int main(void)
+int main()
 {
        plan_tests(TEST_COUNT);