summaryrefslogtreecommitdiffstats
path: root/services
diff options
context:
space:
mode:
authorGreg Hackmann <ghackmann@google.com>2015-02-26 02:27:29 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-02-26 02:27:29 +0000
commit53ec1f0d18a66f7d1e6c5404c14502de09b60b08 (patch)
tree875c6ee021898d1037dd27aa9c4c972675e35e69 /services
parent1d41e3463981c183e38696674ed1f559b1ee0c1d (diff)
parentbeb89e11ca777c92b7e2cc06c25f47d5a75ee7ad (diff)
downloadframeworks_native-53ec1f0d18a66f7d1e6c5404c14502de09b60b08.zip
frameworks_native-53ec1f0d18a66f7d1e6c5404c14502de09b60b08.tar.gz
frameworks_native-53ec1f0d18a66f7d1e6c5404c14502de09b60b08.tar.bz2
am beb89e11: am 6f57b269: am 56f8c6c4: Merge "Error compiling waitforvsync.cpp"
* commit 'beb89e11ca777c92b7e2cc06c25f47d5a75ee7ad': Error compiling waitforvsync.cpp
Diffstat (limited to 'services')
-rw-r--r--services/surfaceflinger/tests/waitforvsync/waitforvsync.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/services/surfaceflinger/tests/waitforvsync/waitforvsync.cpp b/services/surfaceflinger/tests/waitforvsync/waitforvsync.cpp
index 279b88b..b88b04a 100644
--- a/services/surfaceflinger/tests/waitforvsync/waitforvsync.cpp
+++ b/services/surfaceflinger/tests/waitforvsync/waitforvsync.cpp
@@ -23,6 +23,7 @@
#include <errno.h>
#include <string.h>
#include <stdio.h>
+#include <unistd.h>
#ifndef FBIO_WAITFORVSYNC
#define FBIO_WAITFORVSYNC _IOW('F', 0x20, __u32)