diff options
| author | Vladimir Chtchetkine <vchtchetkine@google.com> | 2011-09-23 13:39:07 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-23 13:39:07 -0700 |
| commit | 451687c44df948a99e4fb95296f07d7250e88d08 (patch) | |
| tree | 85e50a4a6698f90c145c27c684034cf9ef4326ad | |
| parent | 2553d03ea6af6df3719b21fa6aeb8d82fbe6cd39 (diff) | |
| parent | 3d3fea0627b4dfb6119ee8173a40640ea8a401f2 (diff) | |
| download | external_qemu-451687c44df948a99e4fb95296f07d7250e88d08.zip external_qemu-451687c44df948a99e4fb95296f07d7250e88d08.tar.gz external_qemu-451687c44df948a99e4fb95296f07d7250e88d08.tar.bz2 | |
Merge "Fix windows build"
| -rwxr-xr-x | android/camera/camera-common.h | 2 | ||||
| -rw-r--r-- | android/camera/camera-service.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/android/camera/camera-common.h b/android/camera/camera-common.h index 37bdef4..de09045 100755 --- a/android/camera/camera-common.h +++ b/android/camera/camera-common.h @@ -189,7 +189,7 @@ _get_timestamp(void) /* Sleeps for the given amount of milliseconds */ static __inline__ void -_sleep(int millisec) +_camera_sleep(int millisec) { struct timeval t; const uint64_t wake_at = _get_timestamp() + (uint64_t)millisec * 1000; diff --git a/android/camera/camera-service.c b/android/camera/camera-service.c index e40035f..ee3ea6e 100644 --- a/android/camera/camera-service.c +++ b/android/camera/camera-service.c @@ -1247,7 +1247,7 @@ _camera_client_query_frame(CameraClient* cc, QemudClient* qc, const char* param) while (repeat == 1 && !cc->frames_cached && (_get_timestamp() - tick) < 2000000LL) { /* Sleep for 10 millisec before repeating the attempt. */ - _sleep(10); + _camera_sleep(10); repeat = camera_device_read_frame(cc->camera, fbs, fbs_num); } if (repeat == 1 && !cc->frames_cached) { |