diff options
| author | Kevron Rees <tripzero.kev@gmail.com> | 2016-05-19 09:46:37 -0700 |
|---|---|---|
| committer | Kevron Rees <tripzero.kev@gmail.com> | 2016-05-19 09:46:37 -0700 |
| commit | b566536fe969c1290299427765402c6ccea3a2b1 (patch) | |
| tree | 3de70dcd57f1f1a1e7b13af0ec4ea6f52a190613 | |
| parent | cfa575b59daa4caa09310fc6f378878605af972c (diff) | |
| parent | c26819073d2a1444a156e4d2e3b61bef81663ea5 (diff) | |
| download | automotive-message-broker-b566536fe969c1290299427765402c6ccea3a2b1.tar.gz | |
Merge pull request #68 from tripzero/master
timestamp: fix for bcm_timeval on older kernels
| -rw-r--r-- | CMakeLists.txt | 11 | ||||
| -rw-r--r-- | lib/timestamp.h | 6 |
2 files changed, 16 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 0fa62aad..f435b0cd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ set(PROJECT_NAME "automotive-message-broker") set(PROJECT_PRETTY_NAME "Automotive Message Broker") set(PROJECT_SERIES "0.15") set(PROJECT_MAJOR_VERSION "0.14") -set(PROJECT_MINOR_VERSION "802") +set(PROJECT_MINOR_VERSION "803") set(PROJECT_VERSION "${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}") set(PROJECT_CODENAME "") set(PROJECT_QUALITY "alpha") @@ -81,6 +81,15 @@ if(usebluez5) endif(usebluez5) +include(CheckCSourceCompiles) +check_c_source_compiles(" + #include <linux/can/bcm.h> + int main() { struct bcm_timeval t; return 0;}" have_bcm_timeval) + +if(have_bcm_timeval) + add_definitions(-DHAVE_BCM_TIMEVAL) +endif(have_bcm_timeval) + set(ARCHIVE_NAME ${CMAKE_PROJECT_NAME}-${PROJECT_VERSION}) add_custom_target(dist COMMAND git archive --prefix=${ARCHIVE_NAME}/ HEAD | bzip2 > ${CMAKE_BINARY_DIR}/${ARCHIVE_NAME}.tar.bz2 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}) diff --git a/lib/timestamp.h b/lib/timestamp.h index d654d3f7..c2effe0e 100644 --- a/lib/timestamp.h +++ b/lib/timestamp.h @@ -4,6 +4,12 @@ #include <time.h> #include <linux/can/bcm.h> +#ifndef HAVE_BCM_TIMEVAL + +#define bcm_timeval timeval + +#endif + namespace amb { double currentTime(); |