mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-09-03 19:38:00 +00:00
Code Issues Releases Wiki Activity

Fix building in Mac OS

Browse Source
This commit is contained in:
Carles Fernandez
2018-12-08 19:08:53 +01:00
parent 17260bbcea
commit 8925ca7066
2 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/algorithms/libs/rtklib/rtklib_stream.cc
View File

@@ -90,7 +90,9 @@ serial_t *openserial(const char *path, int mode, char *msg)
const speed_t bs[] = { const speed_t bs[] = {
B300, B600, B1200, B2400, B4800, B9600, B19200, B38400, B57600, B115200, B230400}; B300, B600, B1200, B2400, B4800, B9600, B19200, B38400, B57600, B115200, B230400};
struct termios ios{}; struct termios ios
{
};
int rw = 0; int rw = 0;
tracet(3, "openserial: path=%s mode=%d\n", path, mode); tracet(3, "openserial: path=%s mode=%d\n", path, mode);
@@ -714,7 +716,7 @@ int gentcp(tcp_t *tcp, int type, char *msg)
tracet(3, "gentcp: type=%d\n", type); tracet(3, "gentcp: type=%d\n", type);
/* generate socket */ /* generate socket */
if ((tcp->sock = socket(AF_INET, SOCK_STREAM | SOCK_CLOEXEC, 0)) == -1) if ((tcp->sock = socket(AF_INET, SOCK_STREAM, 0)) == -1)
{ {
sprintf(msg, "socket error (%d)", errsock()); sprintf(msg, "socket error (%d)", errsock());
tracet(1, "gentcp: socket error err=%d\n", errsock()); tracet(1, "gentcp: socket error err=%d\n", errsock());
@@ -866,7 +868,9 @@ void updatetcpsvr(tcpsvr_t *tcpsvr, char *msg)
/* accept client connection --------------------------------------------------*/ /* accept client connection --------------------------------------------------*/
int accsock(tcpsvr_t *tcpsvr, char *msg) int accsock(tcpsvr_t *tcpsvr, char *msg)
{ {
struct sockaddr_in addr{}; struct sockaddr_in addr
{
};
socket_t sock; socket_t sock;
socklen_t len = sizeof(addr); socklen_t len = sizeof(addr);
int i, err; int i, err;

3
src/core/libs/supl/supl.c
View File

@@ -274,7 +274,7 @@ static int server_connect(char *server) {
} }
for (aip = ailist; aip; aip = aip->ai_next) { for (aip = ailist; aip; aip = aip->ai_next) {
if ((fd = socket(aip->ai_family, SOCK_STREAM | SOCK_CLOEXEC, 0)) < 0) { if ((fd = socket(aip->ai_family, SOCK_STREAM, 0)) < 0) {
err = errno; err = errno;
} }
if (connect(fd, aip->ai_addr, aip->ai_addrlen) != 0) { if (connect(fd, aip->ai_addr, aip->ai_addrlen) != 0) {
@@ -949,4 +949,3 @@ void EXPORT supl_set_debug(FILE *log, int flags) {
if (flags & SUPL_DEBUG_DEBUG) debug.debug = 1; if (flags & SUPL_DEBUG_DEBUG) debug.debug = 1;
#endif #endif
} }