pull/2/head v1.5.8
Jeff Weston 2019-09-11 12:24:09 -04:00
parent a8ab40d749
commit 7dc0cea1b0
5 changed files with 25 additions and 4 deletions

View File

@ -1,5 +1,10 @@
NORM Version History NORM Version History
Version 1.5.8
=============
- Corrections to eliminate compiler warnings and suport kfreebsd builds
(Thanks to Luca Buccassi)
Version 1.5.7 Version 1.5.7
============= =============
- Fixed issue with NormSession::SenderRemoveAckingNode() method where - Fixed issue with NormSession::SenderRemoveAckingNode() method where

View File

@ -33,7 +33,11 @@ typedef int32_t INT32;
typedef uint8_t UINT8; typedef uint8_t UINT8;
typedef uint16_t UINT16; typedef uint16_t UINT16;
typedef uint32_t UINT32; typedef uint32_t UINT32;
#if (defined __GNUC__ && __GNUC__ >= 4)
#define NORM_API_LINKAGE __attribute__ ((visibility ("default")))
#else
#define NORM_API_LINKAGE #define NORM_API_LINKAGE
#endif
#endif // if/else WIN32/UNIX #endif // if/else WIN32/UNIX
//////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////
@ -324,6 +328,8 @@ void NormSetTxOnly(NormSessionHandle sessionHandle,
bool txOnly, bool txOnly,
bool connectToSessionAddress DEFAULT(false)); bool connectToSessionAddress DEFAULT(false));
NORM_API_LINKAGE
void NormSetId(NormSessionHandle sessionHandle, NormNodeId normId);
// This does not affect the rx_socket binding if already bound (sender or receiver already started) // This does not affect the rx_socket binding if already bound (sender or receiver already started)
// (i.e., just affects where NORM packets are sent) // (i.e., just affects where NORM packets are sent)

View File

@ -36,6 +36,6 @@
#ifndef _NORM_VERSION #ifndef _NORM_VERSION
#define _NORM_VERSION #define _NORM_VERSION
#define VERSION "1.5.7" #define VERSION "1.5.8"
#endif // _NORM_VERSION #endif // _NORM_VERSION

View File

@ -185,10 +185,16 @@ void NormFile::Unlock()
{ {
#ifndef WIN32 #ifndef WIN32
#ifdef HAVE_FLOCK #ifdef HAVE_FLOCK
flock(fd, LOCK_UN); if (0 != flock(fd, LOCK_UN))
{
PLOG(PL_ERROR, "NormFile::Unlock() flock() error: %s\n", GetErrorString());
}
#else #else
#ifdef HAVE_LOCKF #ifdef HAVE_LOCKF
lockf(fd, F_ULOCK, 0); if (0 != lockf(fd, F_ULOCK, 0))
{
PLOG(PL_ERROR, "NormFile::Unlock() lockf() error: %s\n", GetErrorString());
}
#endif // HAVE_LOCKF #endif // HAVE_LOCKF
#endif // if/elseHAVE_FLOCK #endif // if/elseHAVE_FLOCK
fchmod(fd, 0640); fchmod(fd, 0640);

View File

@ -64,6 +64,10 @@ def configure(ctx):
if system == 'windows': if system == 'windows':
ctx.env.DEFINES_BUILD_NORM += ['NORM_USE_DLL'] ctx.env.DEFINES_BUILD_NORM += ['NORM_USE_DLL']
if ctx.env.COMPILER_CXX == 'g++' or ctx.env.COMPILER_CXX == 'clang++':
ctx.env.CFLAGS += ['-fvisibility=hidden']
ctx.env.CXXFLAGS += ['-fvisibility=hidden']
def build(ctx): def build(ctx):
ctx.recurse('protolib') ctx.recurse('protolib')