diff options
| author | Ben Noordhuis <info@bnoordhuis.nl> | 2012-11-04 01:25:06 +0100 |
|---|---|---|
| committer | Ben Noordhuis <info@bnoordhuis.nl> | 2012-11-04 01:25:06 +0100 |
| commit | a7ac1a1d8882a20636eeeb8e07e33cd0cfbaf578 (patch) | |
| tree | 7d57c8b0a9e760594bf91e93170e21f23bcf284c /deps/uv/src/unix/darwin.c | |
| parent | a6fef475ceb3e7e001a0dc659c028ad947a50886 (diff) | |
| download | android-node-v8-a7ac1a1d8882a20636eeeb8e07e33cd0cfbaf578.tar.gz android-node-v8-a7ac1a1d8882a20636eeeb8e07e33cd0cfbaf578.tar.bz2 android-node-v8-a7ac1a1d8882a20636eeeb8e07e33cd0cfbaf578.zip | |
deps: upgrade libuv to 0ddf9d6
Diffstat (limited to 'deps/uv/src/unix/darwin.c')
| -rw-r--r-- | deps/uv/src/unix/darwin.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/deps/uv/src/unix/darwin.c b/deps/uv/src/unix/darwin.c index 2b9da40bd6..cc7c817c4d 100644 --- a/deps/uv/src/unix/darwin.c +++ b/deps/uv/src/unix/darwin.c @@ -173,9 +173,7 @@ void uv__cf_loop_signal(uv_loop_t* loop, cf_loop_signal_cb cb, void* arg) { } -#if TARGET_OS_IPHONE -/* see: http://developer.apple.com/library/mac/#qa/qa1398/_index.html */ -uint64_t uv_hrtime() { +uint64_t uv_hrtime(void) { uint64_t time; uint64_t enano; static mach_timebase_info_data_t sTimebaseInfo; @@ -190,15 +188,7 @@ uint64_t uv_hrtime() { return enano; } -#else -uint64_t uv_hrtime() { - uint64_t time; - Nanoseconds enano; - time = mach_absolute_time(); - enano = AbsoluteToNanoseconds(*(AbsoluteTime *)&time); - return (*(uint64_t *)&enano); -} -#endif + int uv_exepath(char* buffer, size_t* size) { uint32_t usize; |