ctf: allocate some structures with new

[babeltrace.git] / src / compat / socket.h

diff --git a/src/compat/socket.h b/src/compat/socket.h
index 7a57678b377e1995b147ce72d9f7aaaf144e0283..4715677e0a043d71b8c86d073106eb9764ae16b0 100644 (file)
--- a/src/compat/socket.h
+++ b/src/compat/socket.h
@@ -18,8 +18,14 @@
 #define BT_SOCKET_ERROR SOCKET_ERROR
 #define BT_SOCKET SOCKET
 
+#ifndef BT_LOG_WRITE_CUR_LVL
+#define BT_SOCKET_LOG_LEVEL_UNUSED_ATTR __attribute__((unused))
+#else
+#define BT_SOCKET_LOG_LEVEL_UNUSED_ATTR
+#endif
+
 static inline
-int bt_socket_init(int log_level)
+int bt_socket_init(int log_level BT_SOCKET_LOG_LEVEL_UNUSED_ATTR)
 {
        WORD verreq;
        WSADATA wsa;
@@ -30,8 +36,8 @@ int bt_socket_init(int log_level)
 
        ret = WSAStartup(verreq, &wsa);
        if (ret != 0) {
-#ifdef BT_LOG_WRITE_CUR_LVL
-               BT_LOG_WRITE_CUR_LVL(BT_LOG_ERROR, log_level, BT_LOG_TAG,
+#ifdef BT_LOG_WRITE_PRINTF_CUR_LVL
+               BT_LOG_WRITE_PRINTF_CUR_LVL(BT_LOG_ERROR, log_level, BT_LOG_TAG,
                                "Winsock init failed with error: %d", ret);
 #endif
                goto end;
@@ -273,7 +279,7 @@ const char *bt_socket_errormsg(void)
 #define BT_SOCKET int
 
 static inline
-int bt_socket_init(int log_level)
+int bt_socket_init(int log_level __attribute__((unused)))
 {
        return 0;
 }