diff options
author | David 'Digit' Turner <digit@android.com> | 2011-04-29 15:09:45 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-04-29 15:09:45 -0700 |
commit | 1ca194d2d4415afbb946d67ae9993b48e74057ef (patch) | |
tree | 828b405365c55ab2956143b3bd55790a423b928d /include | |
parent | 1714a2a53f98e2e7a0b77738eb32649aa8c74ac2 (diff) | |
parent | 05a9b62f315c933e9f92e2fb8ee64f6f8f261d3f (diff) | |
download | hardware_libhardware-1ca194d2d4415afbb946d67ae9993b48e74057ef.zip hardware_libhardware-1ca194d2d4415afbb946d67ae9993b48e74057ef.tar.gz hardware_libhardware-1ca194d2d4415afbb946d67ae9993b48e74057ef.tar.bz2 |
am 05a9b62f: am d1be1d02: Merge "<hardware/qemu_pipe.h>: Allow inclusion from C++"
* commit '05a9b62f315c933e9f92e2fb8ee64f6f8f261d3f':
<hardware/qemu_pipe.h>: Allow inclusion from C++
Diffstat (limited to 'include')
-rw-r--r-- | include/hardware/qemu_pipe.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/hardware/qemu_pipe.h b/include/hardware/qemu_pipe.h index 146fea7..fb0bf2f 100644 --- a/include/hardware/qemu_pipe.h +++ b/include/hardware/qemu_pipe.h @@ -16,6 +16,10 @@ #ifndef ANDROID_INCLUDE_HARDWARE_QEMU_PIPE_H #define ANDROID_INCLUDE_HARDWARE_QEMU_PIPE_H +#include <sys/cdefs.h> + +__BEGIN_DECLS + /* Try to open a new Qemu fast-pipe. This function returns a file descriptor * that can be used to communicate with a named service managed by the * emulator. @@ -40,4 +44,6 @@ */ extern int qemu_pipe_open(const char* pipeName); +__END_DECLS + #endif /* ANDROID_INCLUDE_HARDWARE_QEMUD_PIPE_H */ |