am a60db2e7: am 69139a5a: Merge "Added missing clock_settime()/clock_nanosleep() in time.h API>=8"

* commit 'a60db2e71416714964613c53e0b093bc77aa4442':
  Added missing clock_settime()/clock_nanosleep() in time.h API>=8
This commit is contained in:
Andrew Hsieh
2013-11-14 18:38:04 -08:00
committed by Android Git Automerger

View File

@@ -94,8 +94,10 @@ extern long int timezone;
extern clock_t clock(void); extern clock_t clock(void);
/* BIONIC: extra linux clock goodies */ /* BIONIC: extra linux clock goodies */
extern int clock_getres(int, struct timespec *); extern int clock_getres(clockid_t, struct timespec *);
extern int clock_gettime(int, struct timespec *); extern int clock_gettime(clockid_t, struct timespec *);
extern int clock_settime(clockid_t, const struct timespec *);
extern int clock_nanosleep(clockid_t, int, const struct timespec *, struct timespec *);
#define CLOCK_REALTIME 0 #define CLOCK_REALTIME 0
#define CLOCK_MONOTONIC 1 #define CLOCK_MONOTONIC 1