Fix Linux compiler issues.
This commit is contained in:
parent
5818e8ad6a
commit
0b2702314f
3 changed files with 4 additions and 3 deletions
|
@ -23,6 +23,7 @@
|
||||||
#include <cstdio>
|
#include <cstdio>
|
||||||
#include <cassert>
|
#include <cassert>
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
|
#include <cmath>
|
||||||
#include <ctime>
|
#include <ctime>
|
||||||
|
|
||||||
CAPRSWriter::CAPRSWriter(const std::string& callsign, const std::string& suffix, const std::string& password, const std::string& address, unsigned int port) :
|
CAPRSWriter::CAPRSWriter(const std::string& callsign, const std::string& suffix, const std::string& password, const std::string& address, unsigned int port) :
|
||||||
|
@ -199,7 +200,7 @@ void CAPRSWriter::sendIdFrames()
|
||||||
::strcpy(desc, "MMDVM Voice");
|
::strcpy(desc, "MMDVM Voice");
|
||||||
}
|
}
|
||||||
|
|
||||||
char* band;
|
const char* band;
|
||||||
if (m_txFrequency >= 1200000000U)
|
if (m_txFrequency >= 1200000000U)
|
||||||
band = "1.2";
|
band = "1.2";
|
||||||
else if (m_txFrequency >= 420000000U)
|
else if (m_txFrequency >= 420000000U)
|
||||||
|
|
|
@ -227,13 +227,13 @@ bool CAPRSWriterThread::connect()
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
length = m_socket.readLine(serverResponse, APRS_TIMEOUT);
|
length = m_socket.readLine(serverResponse, APRS_TIMEOUT);
|
||||||
if (length == 0) {
|
if (length == 0) {
|
||||||
LogError("No reply from the APRS server after %u seconds", APRS_TIMEOUT);
|
LogError("No reply from the APRS server after %u seconds", APRS_TIMEOUT);
|
||||||
m_socket.close();
|
m_socket.close();
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (length < 0) {
|
if (length < 0) {
|
||||||
LogError("Error when reading from the APRS server");
|
LogError("Error when reading from the APRS server");
|
||||||
m_socket.close();
|
m_socket.close();
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
CC = gcc
|
CC = gcc
|
||||||
CXX = g++
|
CXX = g++
|
||||||
CFLAGS = -g -O3 -Wall -std=c++0x -pthread
|
CFLAGS = -g -O3 -Wall -std=c++0x -pthread
|
||||||
LIBS = -lpthread
|
LIBS = -lm -lpthread
|
||||||
LDFLAGS = -g
|
LDFLAGS = -g
|
||||||
|
|
||||||
OBJECTS = APRSWriterThread.o APRSWriter.o Conf.o CRC.o Golay24128.o GPS.o Hosts.o Log.o Network.o Reflectors.o StopWatch.o Sync.o TCPSocket.o Thread.o Timer.o \
|
OBJECTS = APRSWriterThread.o APRSWriter.o Conf.o CRC.o Golay24128.o GPS.o Hosts.o Log.o Network.o Reflectors.o StopWatch.o Sync.o TCPSocket.o Thread.o Timer.o \
|
||||||
|
|
Loading…
Add table
Reference in a new issue