X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Flib%2Fplatform%2Fposix%2Fserialport.cpp;h=1e0e364fc8eb2dd5a98738117bd44730b34c5f23;hb=58691fb86d4dd7daac8b283a1bf1f125f00847a5;hp=0089521caa370ae6a929f0a0f92459435da28416;hpb=95587b956c69ead0b46d301f5ca70e977890c3fd;p=deb_libcec.git diff --git a/src/lib/platform/posix/serialport.cpp b/src/lib/platform/posix/serialport.cpp index 0089521..1e0e364 100644 --- a/src/lib/platform/posix/serialport.cpp +++ b/src/lib/platform/posix/serialport.cpp @@ -1,7 +1,7 @@ /* * This file is part of the libCEC(R) library. * - * libCEC(R) is Copyright (C) 2011-2012 Pulse-Eight Limited. All rights reserved. + * libCEC(R) is Copyright (C) 2011-2013 Pulse-Eight Limited. All rights reserved. * libCEC(R) is an original work, containing original code. * * libCEC(R) is a trademark of Pulse-Eight Limited. @@ -48,19 +48,20 @@ #define IUCLC 0 #endif #else +#ifdef HAVE_LOCKDEV #include #endif +#endif using namespace std; using namespace PLATFORM; inline bool RemoveLock(const char *strDeviceName) { - #if !defined(__APPLE__) && !defined(__FreeBSD__) + #if !defined(__APPLE__) && !defined(__FreeBSD__) && defined(HAVE_LOCKDEV) return dev_unlock(strDeviceName, 0) == 0; #else - void *tmp = (void*)strDeviceName; // silence unused warning - tmp = NULL; + (void)strDeviceName; // silence unused warning return true; #endif } @@ -125,7 +126,7 @@ bool CSerialSocket::Open(uint64_t iTimeoutMs /* = 0 */) return false; } - #if !defined(__APPLE__) && !defined(__FreeBSD__) + #if !defined(__APPLE__) && !defined(__FreeBSD__) && defined(HAVE_LOCKDEV) if (dev_lock(m_strName.c_str()) != 0) { m_strError = "Couldn't lock the serial port";