diff options
author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2019-03-23 00:03:29 +0100 |
---|---|---|
committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2019-03-23 00:03:29 +0100 |
commit | 2cf0eaffddab2457fc81d672599c0f58eb6950f9 (patch) | |
tree | f1964cdc4d9a4f7ff8ffa15b2a359cdad55a58d8 /src/fl2k_tcp.c | |
parent | eb11e68412b49b0945ab6bb332ac9486f1ebeb9e (diff) | |
parent | df33203db5007218384e6724748be52a1d4fdb25 (diff) | |
download | osmo-fl2k-2cf0eaffddab2457fc81d672599c0f58eb6950f9.tar.gz osmo-fl2k-2cf0eaffddab2457fc81d672599c0f58eb6950f9.tar.bz2 osmo-fl2k-2cf0eaffddab2457fc81d672599c0f58eb6950f9.zip |
Merge remote-tracking branch 'upstream/master' into interleaved_rg
Diffstat (limited to 'src/fl2k_tcp.c')
-rw-r--r-- | src/fl2k_tcp.c | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/src/fl2k_tcp.c b/src/fl2k_tcp.c index ad0aa18..bd01758 100644 --- a/src/fl2k_tcp.c +++ b/src/fl2k_tcp.c @@ -36,9 +36,12 @@ #include <netinet/in.h> #include <netinet/tcp.h> /* for TCP_NODELAY */ #include <fcntl.h> +#define sleep_ms(ms) usleep(ms*1000) #else +#include <windows.h> #include <winsock2.h> #include "getopt/getopt.h" +#define sleep_ms(ms) Sleep(ms) #endif #include "osmo-fl2k.h" @@ -217,11 +220,7 @@ int main(int argc, char **argv) fprintf(stderr, "Connecting to %s:%d...\n", addr, port); while (connect(sock, (struct sockaddr *)&remote, sizeof(remote)) != 0) { -#ifndef _WIN32 - usleep(500000); -#else - Sleep(0.5); -#endif + sleep_ms(500); if (do_exit) goto out; } @@ -230,13 +229,8 @@ int main(int argc, char **argv) fprintf(stderr, "Connected\n"); connected = 1; - while (!do_exit) { -#ifndef _WIN32 - usleep(500000); -#else - Sleep(0.5); -#endif - } + while (!do_exit) + sleep_ms(500); out: free(txbuf); |