Skip to content

Commit

Permalink
v1.5.8
Browse files Browse the repository at this point in the history
  • Loading branch information
weston-nrl committed Sep 11, 2019
1 parent a8ab40d commit 7dc0cea
Show file tree
Hide file tree
Showing 5 changed files with 25 additions and 4 deletions.
5 changes: 5 additions & 0 deletions VERSION.TXT
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
NORM Version History

Version 1.5.8
=============
- Corrections to eliminate compiler warnings and suport kfreebsd builds
(Thanks to Luca Buccassi)

Version 1.5.7
=============
- Fixed issue with NormSession::SenderRemoveAckingNode() method where
Expand Down
8 changes: 7 additions & 1 deletion include/normApi.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,11 @@ typedef int32_t INT32;
typedef uint8_t UINT8;
typedef uint16_t UINT16;
typedef uint32_t UINT32;
#define NORM_API_LINKAGE
#if (defined __GNUC__ && __GNUC__ >= 4)
#define NORM_API_LINKAGE __attribute__ ((visibility ("default")))
#else
#define NORM_API_LINKAGE
#endif
#endif // if/else WIN32/UNIX

////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -324,6 +328,8 @@ void NormSetTxOnly(NormSessionHandle sessionHandle,
bool txOnly,
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)
// (i.e., just affects where NORM packets are sent)
Expand Down
2 changes: 1 addition & 1 deletion include/normVersion.h
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,6 @@

#ifndef _NORM_VERSION
#define _NORM_VERSION
#define VERSION "1.5.7"
#define VERSION "1.5.8"
#endif // _NORM_VERSION

10 changes: 8 additions & 2 deletions src/common/normFile.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -185,10 +185,16 @@ void NormFile::Unlock()
{
#ifndef WIN32
#ifdef HAVE_FLOCK
flock(fd, LOCK_UN);
if (0 != flock(fd, LOCK_UN))
{
PLOG(PL_ERROR, "NormFile::Unlock() flock() error: %s\n", GetErrorString());
}
#else
#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 // if/elseHAVE_FLOCK
fchmod(fd, 0640);
Expand Down
4 changes: 4 additions & 0 deletions wscript
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@ def configure(ctx):
if system == 'windows':
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):
ctx.recurse('protolib')

Expand Down

0 comments on commit 7dc0cea

Please sign in to comment.