server: portability fixups

Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/server.c b/server.c
index 57745089becc04675969132e63604189b0069451..37ba5939b32c0b17371079261220f474eb53c02f 100644 (file)
--- a/server.c
+++ b/server.c
@@ -400,7 +400,7 @@ void fio_server_idle_loop(void)
 static int accept_loop(int listen_sk)
 {
        struct sockaddr_in addr;
 static int accept_loop(int listen_sk)
 {
        struct sockaddr_in addr;

-       unsigned int len = sizeof(addr);
+       socklen_t len = sizeof(addr);

        struct pollfd pfd;
        int ret, sk, flags, exitval = 0;
 
        struct pollfd pfd;
        int ret, sk, flags, exitval = 0;
 


@@ -631,7 +631,7 @@ static int fio_server(void)
 {
        struct sockaddr_in saddr_in;
        struct sockaddr addr;
 {
        struct sockaddr_in saddr_in;
        struct sockaddr addr;

-       unsigned int len;
+       socklen_t len;

        int sk, opt, ret;
 
        dprint(FD_NET, "starting server\n");
        int sk, opt, ret;
 
        dprint(FD_NET, "starting server\n");

diff --git a/server.h b/server.h
index fe762c94eb39f625e04f702648f9532c796d5957..b3976177ffab5078094ba37586dd8cfe113a97a2 100644 (file)
--- a/server.h
+++ b/server.h
@@ -106,7 +106,7 @@ extern int fio_net_port;
 #define __cpu_to_le64(x)               (x)
 #else
 #define __le16_to_cpu(x)               fio_swap16(x)
 #define __cpu_to_le64(x)               (x)
 #else
 #define __le16_to_cpu(x)               fio_swap16(x)

-#define __le32_to_cpu(x)               fio_swap_2(x)
+#define __le32_to_cpu(x)               fio_swap32(x)

 #define __le64_to_cpu(x)               fio_swap64(x)
 #define __cpu_to_le16(x)               fio_swap16(x)
 #define __cpu_to_le32(x)               fio_swap32(x)
 #define __le64_to_cpu(x)               fio_swap64(x)
 #define __cpu_to_le16(x)               fio_swap16(x)
 #define __cpu_to_le32(x)               fio_swap32(x)