From: maier Date: Sun, 7 Oct 2012 22:40:12 +0000 (+0000) Subject: Bugfixes: Include where this is necessary for kfreebsd X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b32c6712cd40d8ab161d3265131cced7fdbb14fd;p=dealii-svn.git Bugfixes: Include where this is necessary for kfreebsd git-svn-id: https://svn.dealii.org/branches/branch_cmake@26990 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/source/base/logstream.cc b/deal.II/source/base/logstream.cc index 8bd01ce9e3..d21815441a 100644 --- a/deal.II/source/base/logstream.cc +++ b/deal.II/source/base/logstream.cc @@ -17,10 +17,14 @@ #include #include -#if defined(HAVE_SYS_RESOURCE_H) +#ifdef HAVE_SYS_RESOURCE_H # include #endif +#ifdef HAVE_UNISTD_H +# include +#endif + #include #include #include @@ -49,7 +53,7 @@ LogStream::LogStream() { prefixes.push("DEAL:"); std_out->setf(std::ios::showpoint | std::ios::left); -#ifdef HAVE_TIMES +#if defined(HAVE_TIMES) && defined(HAVE_UNISTD_H) reference_time_val = 1./sysconf(_SC_CLK_TCK) * times(&reference_tms); #endif } @@ -357,7 +361,7 @@ LogStream::log_thread_id (const bool flag) void LogStream::print_line_head() { -#if defined(HAVE_SYS_RESOURCE_H) +#ifdef HAVE_SYS_RESOURCE_H rusage usage; double utime = 0.; if (print_utime) @@ -450,7 +454,7 @@ void LogStream::timestamp () { struct tms current_tms; -#ifdef HAVE_TIMES +#if defined(HAVE_TIMES) && defined(HAVE_UNISTD_H) const clock_t tick = sysconf(_SC_CLK_TCK); const double time = 1./tick * times(¤t_tms); #else diff --git a/deal.II/source/base/thread_management.cc b/deal.II/source/base/thread_management.cc index 6cb604912c..fed96e0a6c 100644 --- a/deal.II/source/base/thread_management.cc +++ b/deal.II/source/base/thread_management.cc @@ -19,6 +19,10 @@ #include #include +#ifdef HAVE_UNISTD_H +# include +#endif + DEAL_II_NAMESPACE_OPEN