X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcompat%2Fsocket.h;h=4715677e0a043d71b8c86d073106eb9764ae16b0;hb=4b9e2e3d5986e17f1594c24dea430cb51a529360;hp=f5c59b4bb1e53133ff4757e0c32a8721067ce3d7;hpb=0235b0db7de5bcacdb3650c92461f2ce5eb2143d;p=babeltrace.git

diff --git a/src/compat/socket.h b/src/compat/socket.h
index f5c59b4b..4715677e 100644
--- 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;
@@ -59,13 +65,13 @@ int bt_socket_fini(void)
 static inline
 int bt_socket_send(int sockfd, const void *buf, size_t len, int flags)
 {
-	return send(sockfd, buf, len, flags);
+	return send(sockfd, (const char *) buf, len, flags);
 }
 
 static inline
 int bt_socket_recv(int sockfd, void *buf, size_t len, int flags)
 {
-	return recv(sockfd, buf, len, flags);
+	return recv(sockfd, (char *) buf, len, flags);
 }
 
 static inline
@@ -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;
 }