am 7bd7dd5d: am 3c935eda: resolved conflicts for merge of 33fddf0c to gingerbread-plus-aosp

* commit '7bd7dd5d49e21c66c83618cb9f85ef43af29e441':
  emulator: Add <hardware/qemu_pipe.h> header
This commit is contained in:
David 'Digit' Turner 2011-09-27 12:36:16 -07:00 committed by Android Git Automerger
commit cf20952388

View file

@ -68,7 +68,7 @@ qemu_pipe_open(const char* pipeName)
fd = open("/dev/qemu_pipe", O_RDWR); fd = open("/dev/qemu_pipe", O_RDWR);
if (fd < 0) { if (fd < 0) {
D("%s: Could not open /dev/qemu_pipe: %s", __FUNCTION__, strerror(errno)); D("%s: Could not open /dev/qemu_pipe: %s", __FUNCTION__, strerror(errno));
errno = ENOSYS; //errno = ENOSYS;
return -1; return -1;
} }