diff options
| author | David 'Digit' Turner <digit@google.com> | 2011-09-23 11:17:34 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-09-23 11:17:34 -0700 |
| commit | 7bd7dd5d49e21c66c83618cb9f85ef43af29e441 (patch) | |
| tree | 7df8bafb0bc17af9a238e611ebf2b8cec2ce2f54 | |
| parent | 73bff7f3fddf182bc51a0e20096b76d9e0d877ad (diff) | |
| parent | 3c935eda2dcd96eda70da6367d705b3b081f6524 (diff) | |
| download | libhardware-7bd7dd5d49e21c66c83618cb9f85ef43af29e441.tar.gz | |
am 3c935eda: resolved conflicts for merge of 33fddf0c to gingerbread-plus-aosp
* commit '3c935eda2dcd96eda70da6367d705b3b081f6524':
emulator: Add <hardware/qemu_pipe.h> header
| -rw-r--r-- | include/hardware/qemu_pipe.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/hardware/qemu_pipe.h b/include/hardware/qemu_pipe.h index 000c99ee..1a67022b 100644 --- a/include/hardware/qemu_pipe.h +++ b/include/hardware/qemu_pipe.h @@ -68,7 +68,7 @@ qemu_pipe_open(const char* pipeName) fd = open("/dev/qemu_pipe", O_RDWR); if (fd < 0) { D("%s: Could not open /dev/qemu_pipe: %s", __FUNCTION__, strerror(errno)); - errno = ENOSYS; + //errno = ENOSYS; return -1; } |