summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--cpukit/ChangeLog9
-rw-r--r--cpukit/posix/src/clocksettime.c6
2 files changed, 13 insertions, 2 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog
index cc3f465438..7036018121 100644
--- a/cpukit/ChangeLog
+++ b/cpukit/ChangeLog
@@ -1,3 +1,12 @@
+2011-05-16 Ralf Corsépius <ralf.corsepius@rtems.org>
+
+ * posix/Makefile.am: Add posixtime.h.
+ * posix/src/clockgetres.c, posix/src/clockgettime.c,
+ posix/src/clocksettime.c:
+ Use CLOCK_PROCESS_CPUTIME_ID, CLOCK_THREAD_CPUTIME_ID.
+ Include posix/src/posixtime.h.
+ * posix/src/posixtime.h: New.
+
2011-05-13 Ralf Corsépius <ralf.corsepius@rtems.org>
* libnetworking/rtems/mkrootfs.h: Make self-contained.
diff --git a/cpukit/posix/src/clocksettime.c b/cpukit/posix/src/clocksettime.c
index aa3743d9f9..fa1528a633 100644
--- a/cpukit/posix/src/clocksettime.c
+++ b/cpukit/posix/src/clocksettime.c
@@ -23,6 +23,8 @@
#include <rtems/seterr.h>
+#include "posixtime.h"
+
/*PAGE
*
* 14.2.1 Clocks, P1003.1b-1993, p. 263
@@ -45,11 +47,11 @@ int clock_settime(
_Thread_Enable_dispatch();
}
#ifdef _POSIX_CPUTIME
- else if ( clock_id == CLOCK_PROCESS_CPUTIME )
+ else if ( clock_id == CLOCK_PROCESS_CPUTIME_ID )
rtems_set_errno_and_return_minus_one( ENOSYS );
#endif
#ifdef _POSIX_THREAD_CPUTIME
- else if ( clock_id == CLOCK_THREAD_CPUTIME )
+ else if ( clock_id == CLOCK_THREAD_CPUTIME_ID )
rtems_set_errno_and_return_minus_one( ENOSYS );
#endif
else