diff options
| author | David 'Digit' Turner <digit@google.com> | 2011-09-23 20:13:07 +0200 |
|---|---|---|
| committer | David 'Digit' Turner <digit@google.com> | 2011-09-23 20:13:07 +0200 |
| commit | 3c935eda2dcd96eda70da6367d705b3b081f6524 (patch) | |
| tree | d13f24e277534af7e2842e543d8ad4b5350046f3 | |
| parent | bce402a8fadf27b07b164b0468e27bb9b6de79e6 (diff) | |
| parent | 33fddf0ca9801080472116654264be63a21b6e80 (diff) | |
| download | libhardware-3c935eda2dcd96eda70da6367d705b3b081f6524.tar.gz | |
resolved conflicts for merge of 33fddf0c to gingerbread-plus-aosp
Change-Id: I8720ca884f326b661e30b51c4cf1cfe31c1ac579
| -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; } |