/*
* 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.
* http://www.pulse-eight.net/
*/
-#include "../os.h"
+#include "env.h"
#include <stdio.h>
#include <fcntl.h>
-#include "../sockets/serialport.h"
-#include "../util/baudrate.h"
-#include "../posix/os-socket.h"
+#include "lib/platform/sockets/serialport.h"
+#include "lib/platform/util/baudrate.h"
+#include "lib/platform/posix/os-socket.h"
#if defined(__APPLE__) || defined(__FreeBSD__)
#ifndef XCASE
#define IUCLC 0
#endif
#else
+#ifdef HAVE_LOCKDEV
#include <lockdev.h>
#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)strDeviceName; // silence unused warning
+ return true;
#endif
}
//setting all this stuff up is a pain in the ass
bool CSerialSocket::Open(uint64_t iTimeoutMs /* = 0 */)
{
- iTimeoutMs = 0;
+ iTimeoutMs = 0; if (!iTimeoutMs){} // silence unused warning
if (IsOpen())
{
m_iError = EINVAL;
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";