fix compilation errors under Linux
This commit is contained in:
parent
1c1e07bd24
commit
a9c0e243dd
2 changed files with 21 additions and 2 deletions
|
@ -489,7 +489,7 @@ EPutDataStat CChannel::PutData ( const CVector<uint8_t>& vecbyData,
|
||||||
// message
|
// message
|
||||||
// TODO a copy of the vector is used -> avoid malloc in real-time routine
|
// TODO a copy of the vector is used -> avoid malloc in real-time routine
|
||||||
#ifdef ENABLE_RECEIVE_SOCKET_IN_SEPARATE_THREAD
|
#ifdef ENABLE_RECEIVE_SOCKET_IN_SEPARATE_THREAD
|
||||||
emit pSocket->DetectedCLMessage ( vecbyMesBodyData, iRecID );
|
pSocket->EmitDetectedCLMessage ( vecbyMesBodyData, iRecID );
|
||||||
#else
|
#else
|
||||||
emit DetectedCLMessage ( vecbyMesBodyData, iRecID );
|
emit DetectedCLMessage ( vecbyMesBodyData, iRecID );
|
||||||
#endif
|
#endif
|
||||||
|
@ -502,7 +502,7 @@ EPutDataStat CChannel::PutData ( const CVector<uint8_t>& vecbyData,
|
||||||
// parse the message assuming this is a regular protocol message
|
// parse the message assuming this is a regular protocol message
|
||||||
// TODO a copy of the vector is used -> avoid malloc in real-time routine
|
// TODO a copy of the vector is used -> avoid malloc in real-time routine
|
||||||
#ifdef ENABLE_RECEIVE_SOCKET_IN_SEPARATE_THREAD
|
#ifdef ENABLE_RECEIVE_SOCKET_IN_SEPARATE_THREAD
|
||||||
emit pSocket->ParseMessageBody ( vecbyMesBodyData, iRecCounter, iRecID );
|
pSocket->EmitParseMessageBody ( vecbyMesBodyData, iRecCounter, iRecID );
|
||||||
#else
|
#else
|
||||||
emit ParseMessageBody ( vecbyMesBodyData, iRecCounter, iRecID );
|
emit ParseMessageBody ( vecbyMesBodyData, iRecCounter, iRecID );
|
||||||
#endif
|
#endif
|
||||||
|
|
19
src/socket.h
19
src/socket.h
|
@ -74,11 +74,30 @@ public:
|
||||||
|
|
||||||
bool GetAndResetbJitterBufferOKFlag();
|
bool GetAndResetbJitterBufferOKFlag();
|
||||||
|
|
||||||
|
#ifdef ENABLE_RECEIVE_SOCKET_IN_SEPARATE_THREAD
|
||||||
|
void EmitDetectedCLMessage ( const CVector<uint8_t>& vecbyMesBodyData,
|
||||||
|
const int iRecID )
|
||||||
|
{
|
||||||
|
emit DetectedCLMessage ( vecbyMesBodyData, iRecID );
|
||||||
|
}
|
||||||
|
|
||||||
|
void EmitParseMessageBody ( const CVector<uint8_t>& vecbyMesBodyData,
|
||||||
|
const int iRecCounter,
|
||||||
|
const int iRecID )
|
||||||
|
{
|
||||||
|
emit ParseMessageBody ( vecbyMesBodyData, iRecCounter, iRecID );
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void Init ( const quint16 iPortNumber = LLCON_DEFAULT_PORT_NUMBER );
|
void Init ( const quint16 iPortNumber = LLCON_DEFAULT_PORT_NUMBER );
|
||||||
|
|
||||||
#ifdef ENABLE_RECEIVE_SOCKET_IN_SEPARATE_THREAD
|
#ifdef ENABLE_RECEIVE_SOCKET_IN_SEPARATE_THREAD
|
||||||
|
# ifdef _WIN32
|
||||||
SOCKET UdpSocket;
|
SOCKET UdpSocket;
|
||||||
|
# else
|
||||||
|
int UdpSocket;
|
||||||
|
# endif
|
||||||
#endif
|
#endif
|
||||||
QUdpSocket SocketDevice;
|
QUdpSocket SocketDevice;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue