diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-02-15 17:18:04 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-02-15 17:18:04 -0600 |
| commit | 65b31cc207b8ab949033870acf55bb124d12848e (patch) | |
| tree | c7727e413b24d8ae024fea2ab455f8c49be02b20 /compiler.h | |
| parent | b2d4b3f7b8c8ad0519c4705a3b850446068e6946 (diff) | |
| parent | b867672884afc39b6537a8aa6aa2f20a5154bf4f (diff) | |
| download | focaccia-qemu-65b31cc207b8ab949033870acf55bb124d12848e.tar.gz focaccia-qemu-65b31cc207b8ab949033870acf55bb124d12848e.zip | |
Merge remote-tracking branch 'kwolf/for-anthony' into staging
* kwolf/for-anthony: AHCI: Masking of IRQs actually masks them sheepdog: fix co_recv coroutine context AHCI: Fix port reset race rewrite QEMU_BUILD_BUG_ON qcow2: Keep unknown header extension when rewriting header qcow2: Update whole header at once vpc: Round up image size during fixed image creation vpc: Add support for Fixed Disk type iSCSI: add configuration variables for iSCSI qemu-io: add write -z option for bdrv_co_write_zeroes qed: add .bdrv_co_write_zeroes() support qed: replace is_write with flags field block: perform zero-detection during copy-on-read block: add .bdrv_co_write_zeroes() interface cutils: extract buffer_is_zero() from qemu-img.c
Diffstat (limited to 'compiler.h')
| -rw-r--r-- | compiler.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/compiler.h b/compiler.h index a1c0794947..736e77075a 100644 --- a/compiler.h +++ b/compiler.h @@ -30,8 +30,10 @@ # define QEMU_PACKED __attribute__((packed)) #endif +#define cat(x,y) x ## y +#define cat2(x,y) cat(x,y) #define QEMU_BUILD_BUG_ON(x) \ - typedef char qemu_build_bug_on__##__LINE__[(x)?-1:1]; + typedef char cat2(qemu_build_bug_on__,__LINE__)[(x)?-1:1]; #if defined __GNUC__ # if !QEMU_GNUC_PREREQ(4, 4) |