Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes for compile breakage #705

Merged
merged 1 commit into from
Oct 10, 2017
Merged

Fixes for compile breakage #705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions daemons/gptp/linux/src/linux_hal_common.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -704,9 +704,10 @@ bool LinuxLock::initialize( OSLockType type ) {
lock_c = pthread_mutex_init(&_private->mutex,&_private->mta);
if(lock_c != 0) {
GPTP_LOG_ERROR("Mutex initialization failed - %s",strerror(errno));
return oslock_fail;
return false;
}
return oslock_ok;

return true;
}

LinuxLock::~LinuxLock() {
Expand Down
5 changes: 4 additions & 1 deletion daemons/gptp/linux/src/linux_hal_generic_adj.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,12 @@
******************************************************************************/

#include <linux/timex.h>
// avoid indirect inclusion of time.h since this will clash with linux/timex.h
// linux_hal_generic.hpp pulls in redefinition of struct timespec and timeval
// Below are defines that prevent this:
#define _TIME_H 1
#define _STRUCT_TIMEVAL 1
#define __timeval_defined 1
#define __timespec_defined 1
#include <linux_hal_generic.hpp>
#include <syscall.h>
#include <math.h>
Expand Down