diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2011-05-19 06:31:42 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2011-05-19 06:31:42 +0000 |
| commit | 20e3bf7a1bffbf03446157df9e84b027861534e8 (patch) | |
| tree | 6d922ddfa14f037260cd838e97d155450d164e96 /cpukit | |
| parent | 2011-05-18 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
| download | rtems-20e3bf7a1bffbf03446157df9e84b027861534e8.tar.bz2 | |
2011-05-19 Ralf Corsépius <ralf.corsepius@rtems.org>
* posix/Makefile.am: Remove posixtime.h.
* posix/src/clockgetres.c, posix/src/clockgettime.c,
posix/src/clocksettime.c: Remove posixtime.h.
Require CLOCK_PROCESS_CPUTIME_ID, CLOCK_THREAD_CPUTIME_ID.
* posix/src/posixtime.h: Remove.
Diffstat (limited to 'cpukit')
| -rw-r--r-- | cpukit/ChangeLog | 8 | ||||
| -rw-r--r-- | cpukit/posix/Makefile.am | 1 | ||||
| -rw-r--r-- | cpukit/posix/src/clockgetres.c | 2 | ||||
| -rw-r--r-- | cpukit/posix/src/clockgettime.c | 2 | ||||
| -rw-r--r-- | cpukit/posix/src/clocksettime.c | 2 | ||||
| -rw-r--r-- | cpukit/posix/src/posixtime.h | 36 |
6 files changed, 8 insertions, 43 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index 9778428f88..0a67a307c7 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,11 @@ +2011-05-19 Ralf Corsépius <ralf.corsepius@rtems.org> + + * posix/Makefile.am: Remove posixtime.h. + * posix/src/clockgetres.c, posix/src/clockgettime.c, + posix/src/clocksettime.c: Remove posixtime.h. + Require CLOCK_PROCESS_CPUTIME_ID, CLOCK_THREAD_CPUTIME_ID. + * posix/src/posixtime.h: Remove. + 2011-05-18 Ralf Corsépius <ralf.corsepius@rtems.org> * score/Makefile.am: Reformat. diff --git a/cpukit/posix/Makefile.am b/cpukit/posix/Makefile.am index 33f831c63b..672fb9bb47 100644 --- a/cpukit/posix/Makefile.am +++ b/cpukit/posix/Makefile.am @@ -16,7 +16,6 @@ libposix_a_SOURCES = # Some POSIX functions that are nice to always have libposix_a_SOURCES += src/nanosleep.c src/clockgettime.c src/clocksettime.c \ src/clockgetres.c src/sysconf.c -libposix_a_SOURCES += src/posixtime.h include_rtems_posixdir = $(includedir)/rtems/posix diff --git a/cpukit/posix/src/clockgetres.c b/cpukit/posix/src/clockgetres.c index 3c3e76f38f..18c1eb98d0 100644 --- a/cpukit/posix/src/clockgetres.c +++ b/cpukit/posix/src/clockgetres.c @@ -28,8 +28,6 @@ #include <rtems/seterr.h> -#include "posixtime.h" - /*PAGE * * 14.2.1 Clocks, P1003.1b-1993, p. 263 diff --git a/cpukit/posix/src/clockgettime.c b/cpukit/posix/src/clockgettime.c index 5b0b6eebeb..31b366cc8e 100644 --- a/cpukit/posix/src/clockgettime.c +++ b/cpukit/posix/src/clockgettime.c @@ -23,8 +23,6 @@ #include <rtems/seterr.h> -#include "posixtime.h" - /*PAGE * * 14.2.1 Clocks, P1003.1b-1993, p. 263 diff --git a/cpukit/posix/src/clocksettime.c b/cpukit/posix/src/clocksettime.c index fa1528a633..741e4b38d0 100644 --- a/cpukit/posix/src/clocksettime.c +++ b/cpukit/posix/src/clocksettime.c @@ -23,8 +23,6 @@ #include <rtems/seterr.h> -#include "posixtime.h" - /*PAGE * * 14.2.1 Clocks, P1003.1b-1993, p. 263 diff --git a/cpukit/posix/src/posixtime.h b/cpukit/posix/src/posixtime.h deleted file mode 100644 index bc28d60684..0000000000 --- a/cpukit/posix/src/posixtime.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Copyright (c) 2011. - * Ralf Corsépius, Ulm/Germany. - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.com/license/LICENSE. - * - * $Id$ - */ - -/* - * Adapt RTEMS to newlibs with broken - * CLOCK_PROCESS_CPUTIME_ID/CLOCK_PROCESS_CPUTIME - * CLOCK_THREAD_CPUTIME_ID/CLOCK_THREAD_CPUTIME - */ - -#ifndef _SRC_POSIX_POSIXTIME_H -#define _SRC_POSIX_POSIXTIME_H - -#include <time.h> - -#ifdef RTEMS_NEWLIB -/* Older newlibs bogusly used CLOCK_PROCESS_CPUTIME - instead of CLOCK_PROCESS_CPUTIME_ID */ -#ifndef CLOCK_PROCESS_CPUTIME_ID -#define CLOCK_PROCESS_CPUTIME_ID CLOCK_PROCESS_CPUTIME -#endif -/* Older newlibs bogusly used CLOCK_THREAD_CPUTIME - instead of CLOCK_PROCESS_CPUTIME_ID */ -#ifndef CLOCK_THREAD_CPUTIME_ID -#define CLOCK_THREAD_CPUTIME_ID CLOCK_THREAD_CPUTIME -#endif -#endif - -#endif |