mirror of
https://github.com/AlexandreRouma/SDRPlusPlus.git
synced 2025-03-26 17:45:28 +01:00
fixes
This commit is contained in:
parent
aa06db4d7a
commit
ebc9911f18
2
.github/workflows/build_all.yml
vendored
2
.github/workflows/build_all.yml
vendored
@ -87,7 +87,7 @@ jobs:
|
|||||||
run: brew update
|
run: brew update
|
||||||
|
|
||||||
- name: Install dependencies
|
- name: Install dependencies
|
||||||
run: brew install libusb fftw glfw airspy airspyhf portaudio hackrf rtl-sdr libbladerf codec2 && pip3 install mako zstd uhd
|
run: brew install libusb fftw glfw airspy airspyhf portaudio hackrf rtl-sdr libbladerf codec2 uhd zstd && pip3 install mako
|
||||||
|
|
||||||
- name: Install volk
|
- name: Install volk
|
||||||
run: git clone --recursive https://github.com/gnuradio/volk && cd volk && mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Release .. && make -j3 && sudo make install && cd ../../
|
run: git clone --recursive https://github.com/gnuradio/volk && cd volk && mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Release .. && make -j3 && sudo make install && cd ../../
|
||||||
|
@ -165,7 +165,7 @@ namespace net {
|
|||||||
|
|
||||||
// Receive
|
// Receive
|
||||||
int addrLen = sizeof(sockaddr_in);
|
int addrLen = sizeof(sockaddr_in);
|
||||||
int err = ::recvfrom(sock, (char*)&data[read], maxLen - read, 0,(sockaddr*)(dest ? &dest->addr : NULL), dest ? &addrLen : NULL);
|
int err = ::recvfrom(sock, (char*)&data[read], maxLen - read, 0,(sockaddr*)(dest ? &dest->addr : NULL), (socklen_t*)(dest ? &addrLen : NULL));
|
||||||
if (err <= 0 && !WOULD_BLOCK) {
|
if (err <= 0 && !WOULD_BLOCK) {
|
||||||
close();
|
close();
|
||||||
return err;
|
return err;
|
||||||
@ -232,7 +232,7 @@ namespace net {
|
|||||||
|
|
||||||
// Accept
|
// Accept
|
||||||
int addrLen = sizeof(sockaddr_in);
|
int addrLen = sizeof(sockaddr_in);
|
||||||
SockHandle_t s = ::accept(sock, (sockaddr*)(dest ? &dest->addr : NULL), dest ? &addrLen : NULL);
|
SockHandle_t s = ::accept(sock, (sockaddr*)(dest ? &dest->addr : NULL), (socklen_t*)(dest ? &addrLen : NULL));
|
||||||
if ((int)s < 0) {
|
if ((int)s < 0) {
|
||||||
if (!WOULD_BLOCK) { stop(); }
|
if (!WOULD_BLOCK) { stop(); }
|
||||||
return NULL;
|
return NULL;
|
||||||
|
@ -21,6 +21,7 @@
|
|||||||
namespace net {
|
namespace net {
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
typedef SOCKET SockHandle_t;
|
typedef SOCKET SockHandle_t;
|
||||||
|
typedef int socklen_t;
|
||||||
#else
|
#else
|
||||||
typedef int SockHandle_t;
|
typedef int SockHandle_t;
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
x
Reference in New Issue
Block a user