diff options
author | David 'Digit' Turner <digit@google.com> | 2011-09-27 12:36:16 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-09-27 12:36:16 -0700 |
commit | cf209523884350a3ad6af5840f1b0ae2dde9b98b (patch) | |
tree | ddb15a20cfba9412d8bfd27aac5bcf0c08cd45d2 | |
parent | cc3f6a345b0cc356b22f9ea748505ce8a705d358 (diff) | |
parent | 7bd7dd5d49e21c66c83618cb9f85ef43af29e441 (diff) | |
download | hardware_libhardware-cf209523884350a3ad6af5840f1b0ae2dde9b98b.zip hardware_libhardware-cf209523884350a3ad6af5840f1b0ae2dde9b98b.tar.gz hardware_libhardware-cf209523884350a3ad6af5840f1b0ae2dde9b98b.tar.bz2 |
am 7bd7dd5d: am 3c935eda: resolved conflicts for merge of 33fddf0c to gingerbread-plus-aosp
* commit '7bd7dd5d49e21c66c83618cb9f85ef43af29e441':
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 000c99e..1a67022 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; } |