diff options
| author | Anthony Liguori | 2013-05-13 16:44:25 +0200 |
|---|---|---|
| committer | Anthony Liguori | 2013-05-13 16:44:25 +0200 |
| commit | f6e136e47a6adc176cb53a24cf5a515ca09f977f (patch) | |
| tree | 6ba37c38ba2dd0af4a3f889f7c1f9e88c609f984 /include | |
| parent | Merge remote-tracking branch 'spice/spice.v70' into staging (diff) | |
| parent | osdep.h: include sys/types.h for ssize_t definition (diff) | |
| download | qemu-f6e136e47a6adc176cb53a24cf5a515ca09f977f.tar.gz qemu-f6e136e47a6adc176cb53a24cf5a515ca09f977f.tar.xz qemu-f6e136e47a6adc176cb53a24cf5a515ca09f977f.zip | |
Merge remote-tracking branch 'mjt/trivial-patches-next' into staging
# By Dong Xu Wang (2) and others
# Via Michael Tokarev
* mjt/trivial-patches-next:
osdep.h: include sys/types.h for ssize_t definition
remove double semicolons
clean unnecessary code: don't check g_strdup arg for NULL
docs: mention AddressSpaces in docs/memory.txt
audio: update documentation after removing --audio-card-list option
m25p80.c: Sync Flash chip list with Linux
bsd-user: OS-agnostic 64-bit SYSCTL types
Message-id: 518F61B9.9050803@msgid.tls.msk.ru
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/qemu/osdep.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h index 42545bcbdb..3bcd4ab7cd 100644 --- a/include/qemu/osdep.h +++ b/include/qemu/osdep.h @@ -5,8 +5,8 @@ #include <stdarg.h> #include <stddef.h> #include <stdbool.h> -#ifdef __OpenBSD__ #include <sys/types.h> +#ifdef __OpenBSD__ #include <sys/signal.h> #endif |