tools: play nice with mingw/cygwin

This commit is contained in:
Hoernchen 2013-10-25 01:11:44 +02:00
parent 7614a4d684
commit dbede4e3c0
8 changed files with 12 additions and 8 deletions

View File

@ -117,7 +117,7 @@ endif()
if(WIN32) if(WIN32)
target_link_libraries(rtl_sdr libgetopt_static) target_link_libraries(rtl_sdr libgetopt_static)
target_link_libraries(rtl_tcp libgetopt_static) target_link_libraries(rtl_tcp ws2_32 libgetopt_static)
target_link_libraries(rtl_test libgetopt_static) target_link_libraries(rtl_test libgetopt_static)
target_link_libraries(rtl_fm libgetopt_static) target_link_libraries(rtl_fm libgetopt_static)
target_link_libraries(rtl_eeprom libgetopt_static) target_link_libraries(rtl_eeprom libgetopt_static)

View File

@ -31,7 +31,7 @@
#ifndef _WIN32 #ifndef _WIN32
#include <unistd.h> #include <unistd.h>
#else #else
#include <Windows.h> #include <windows.h>
#include <fcntl.h> #include <fcntl.h>
#include <io.h> #include <io.h>
#include "getopt/getopt.h" #include "getopt/getopt.h"

View File

@ -24,7 +24,7 @@
#ifndef _WIN32 #ifndef _WIN32
#include <unistd.h> #include <unistd.h>
#else #else
#include <Windows.h> #include <windows.h>
#include "getopt/getopt.h" #include "getopt/getopt.h"
#endif #endif

View File

@ -52,7 +52,7 @@
#ifndef _WIN32 #ifndef _WIN32
#include <unistd.h> #include <unistd.h>
#else #else
#include <Windows.h> #include <windows.h>
#include <fcntl.h> #include <fcntl.h>
#include <io.h> #include <io.h>
#include "getopt/getopt.h" #include "getopt/getopt.h"

View File

@ -49,7 +49,7 @@
#ifndef _WIN32 #ifndef _WIN32
#include <unistd.h> #include <unistd.h>
#else #else
#include <Windows.h> #include <windows.h>
#include <fcntl.h> #include <fcntl.h>
#include <io.h> #include <io.h>
#include "getopt/getopt.h" #include "getopt/getopt.h"

View File

@ -25,7 +25,7 @@
#ifndef _WIN32 #ifndef _WIN32
#include <unistd.h> #include <unistd.h>
#else #else
#include <Windows.h> #include <windows.h>
#include <io.h> #include <io.h>
#include <fcntl.h> #include <fcntl.h>
#include "getopt/getopt.h" #include "getopt/getopt.h"

View File

@ -33,7 +33,7 @@
#include <netinet/in.h> #include <netinet/in.h>
#include <fcntl.h> #include <fcntl.h>
#else #else
#include <WinSock2.h> #include <winsock2.h>
#include "getopt/getopt.h" #include "getopt/getopt.h"
#endif #endif
@ -109,7 +109,11 @@ int gettimeofday(struct timeval *tv, void* ignored)
tmp <<= 32; tmp <<= 32;
tmp |= ft.dwLowDateTime; tmp |= ft.dwLowDateTime;
tmp /= 10; tmp /= 10;
#ifdef _MSC_VER
tmp -= 11644473600000000Ui64; tmp -= 11644473600000000Ui64;
#else
tmp -= 11644473600000000ULL;
#endif
tv->tv_sec = (long)(tmp / 1000000UL); tv->tv_sec = (long)(tmp / 1000000UL);
tv->tv_usec = (long)(tmp % 1000000UL); tv->tv_usec = (long)(tmp % 1000000UL);
} }

View File

@ -32,7 +32,7 @@
#ifndef _WIN32 #ifndef _WIN32
#include <unistd.h> #include <unistd.h>
#else #else
#include <Windows.h> #include <windows.h>
#include "getopt/getopt.h" #include "getopt/getopt.h"
#endif #endif