diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2009-09-12 07:36:22 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2009-09-12 07:36:22 +0000 |
| commit | 72cf2d4f0e181d0d3a3122e04129c58a95da713e (patch) | |
| tree | 4d13c505a692104406090e94dd654fd1e98ec34e /sysemu.h | |
| parent | 620150dc9c1827cdddfa64a0fada7af5f7ee405b (diff) | |
| download | qemu-72cf2d4f0e181d0d3a3122e04129c58a95da713e.tar.gz | |
Fix sys-queue.h conflict for good
Problem: Our file sys-queue.h is a copy of the BSD file, but there are
some additions and it's not entirely compatible. Because of that, there have
been conflicts with system headers on BSD systems. Some hacks have been
introduced in the commits 15cc9235840a22c289edbe064a9b3c19c5f49896,
f40d753718c72693c5f520f0d9899f6e50395e94,
96555a96d724016e13190b28cffa3bc929ac60dc and
3990d09adf4463eca200ad964cc55643c33feb50 but the fixes were fragile.
Solution: Avoid the conflict entirely by renaming the functions and the
file. Revert the previous hacks.
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'sysemu.h')
| -rw-r--r-- | sysemu.h | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -4,7 +4,7 @@ #include "qemu-common.h" #include "qemu-option.h" -#include "sys-queue.h" +#include "qemu-queue.h" #include "qdict.h" #ifdef _WIN32 @@ -174,15 +174,15 @@ typedef struct DriveInfo { QemuOpts *opts; BlockInterfaceErrorAction onerror; char serial[BLOCK_SERIAL_STRLEN + 1]; - TAILQ_ENTRY(DriveInfo) next; + QTAILQ_ENTRY(DriveInfo) next; } DriveInfo; #define MAX_IDE_DEVS 2 #define MAX_SCSI_DEVS 7 #define MAX_DRIVES 32 -extern TAILQ_HEAD(drivelist, DriveInfo) drives; -extern TAILQ_HEAD(driveoptlist, DriveOpt) driveopts; +extern QTAILQ_HEAD(drivelist, DriveInfo) drives; +extern QTAILQ_HEAD(driveoptlist, DriveOpt) driveopts; extern DriveInfo *drive_get(BlockInterfaceType type, int bus, int unit); extern DriveInfo *drive_get_by_id(const char *id); |