From 4623862b5c974ce7a798750227d7bc7b8502883c Mon Sep 17 00:00:00 2001 From: oldfaber Date: Fri, 29 Jun 2012 15:14:37 +0200 Subject: [PATCH] Fix compilation and execution of bandwidth tests in Windows. --- tests/bandwidth-client.c | 12 +++++++++++- tests/bandwidth-server-one.c | 7 ++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/tests/bandwidth-client.c b/tests/bandwidth-client.c index e9109e1..d8dbc50 100644 --- a/tests/bandwidth-client.c +++ b/tests/bandwidth-client.c @@ -16,11 +16,13 @@ */ #include +#ifndef _MSC_VER #include +#include +#endif #include #include #include -#include #include #include @@ -30,7 +32,15 @@ uint32_t gettime_ms(void) { struct timeval tv; +#if !defined(_MSC_VER) gettimeofday (&tv, NULL); +#else + SYSTEMTIME st; + + GetLocalTime(&st); + tv.tv_sec = st.wSecond; + tv.tv_usec = st.wMilliseconds * 1000; +#endif return (uint32_t) tv.tv_sec * 1000 + tv.tv_usec / 1000; } diff --git a/tests/bandwidth-server-one.c b/tests/bandwidth-server-one.c index 6d67625..09dd3f2 100644 --- a/tests/bandwidth-server-one.c +++ b/tests/bandwidth-server-one.c @@ -16,10 +16,15 @@ */ #include +#ifndef _MSC_VER #include +#endif #include #include #include +#if !defined(_WIN32) +#define closesocket(s) close(s) +#endif #include @@ -86,7 +91,7 @@ int main(int argc, char *argv[]) printf("Quit the loop: %s\n", modbus_strerror(errno)); modbus_mapping_free(mb_mapping); - close(socket); + closesocket(socket); modbus_free(ctx); return 0; -- libgit2 0.21.4