• Skip to sidebar navigation
  • Skip to content

Bitbucket

  • More
    ProjectsRepositories
  • Help
    • Online help
    • Learn Git
    • Welcome to Bitbucket
    • Keyboard shortcuts
  • Log In
Alexander Dahl
  1. Alexander Dahl

buildroot

Public
Actions
  • Clone
  • Compare

Learn more about cloning repositories

You have read-only access

Navigation
  • Source
  • Commits
  • Branches
  • All Branches Graph
  • Forks
  1. Alexander Dahl
  2. buildroot

Source

buildroot/package/libasplib/0001-asplib_CPUTimer.h-Fix-time.h-include.patch
Bernd KuhlsBernd Kuhls committed 958bd2fad2727 Jan 2017
Raw file
Source viewDiff to previous
xxxxxxxxxx
 
1
From 7291289ba0c052e45e2a0330642318798d6a4caf Mon Sep 17 00:00:00 2001
2
From: Bernd Kuhls <bernd.kuhls@t-online.de>
3
Date: Fri, 27 Jan 2017 16:02:27 +0100
4
Subject: [PATCH 1/1] asplib_CPUTimer.h: Fix time.h include
5
​
6
According to https://linux.die.net/man/3/clock_gettime time.h needs to
7
be included instead of sys/time.h.
8
​
9
This patch fixes a build error found by buildroot autobuilders:
10
​
11
http://autobuild.buildroot.net/results/cc0/cc0b928ee24a526b7c82fd3f391e2be024a14578//
12
​
13
/home/peko/autobuild/instance-1/output/build/libasplib-be7fac89218a84b75f7598e3d76625ece99296f2/asplib_modules/Timer/asplib/Timer/asplib_CPUTimer.cpp: In member function 'void asplib::CCPUTimer::start_Timer()':
14
/home/peko/autobuild/instance-1/output/build/libasplib-be7fac89218a84b75f7598e3d76625ece99296f2/asplib_modules/Timer/asplib/Timer/asplib_CPUTimer.cpp:69:19: error: 'CLOCK_REALTIME' was not declared in this scope
15
     clock_gettime(CLOCK_REALTIME, &m_startTime);
16
​
17
Patch sent upstream: https://github.com/AchimTuran/asplib/pull/34
18
​
19
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
20
---
21
 asplib_modules/Timer/asplib/Timer/asplib_CPUTimer.h | 2 +-
22
 1 file changed, 1 insertion(+), 1 deletion(-)
23
​
24
diff --git a/asplib_modules/Timer/asplib/Timer/asplib_CPUTimer.h b/asplib_modules/Timer/asplib/Timer/asplib_CPUTimer.h
25
index a61ff49..a9676e0 100644
26
--- a/asplib_modules/Timer/asplib/Timer/asplib_CPUTimer.h
27
+++ b/asplib_modules/Timer/asplib/Timer/asplib_CPUTimer.h
28
@@ -29,7 +29,7 @@
29
   #include <windows.h>
30
   #include <time.h>
31
 #elif defined(TARGET_LINUX)
32
-  #include <sys/time.h>
33
+  #include <time.h>
34
 #endif
35
 
36
 namespace asplib
37
-- 
38
2.11.0
39
​
  • Git repository management for enterprise teams powered by Atlassian Bitbucket
  • Atlassian Bitbucket v6.7.2
  • Documentation
  • Request a feature
  • About
  • Contact Atlassian
Atlassian

Everything looks good. We'll let you know here if there's anything you should know about.