← Back to branch summary

~vcs-imports/qemu/maemo

« back to all changes in this revision

Viewing changes to tests/linux-test.c

  • Committer: Riku Voipio
  • Date: 2009-06-08 15:31:58 UTC
  • mfrom: (6281.2.366)
  • mto: This revision was merged to the branch mainline in revision 6452.
  • Revision ID: git-v1:759b334a9739814df2883aa4c41b1c0f5670e90a
Merge commit 'gnu/master' into test

Epic merge

Conflicts:
        Makefile
        block.c
        block.h
        configure
        hw/boards.h
        hw/flash.h
        hw/integratorcp.c
        hw/nand.c
        hw/omap2.c
        hw/omap_i2c.c
        hw/sd.c
        hw/smc91c111.c
        hw/tsc2005.c
        hw/tusb6010.c
        hw/usb-musb.c
        linux-user/syscall.c
        target-arm/machine.c
        target-arm/translate.c

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/linux-test.c
65
65
    return ret;
66
66
}
67
67
 
68
 
#define error(fmt, args...) error1(__FILE__, __LINE__, fmt, ##args)
 
68
#define error(fmt, ...) error1(__FILE__, __LINE__, fmt, ## __VA_ARGS__)
69
69
 
70
70
#define chk_error(ret) __chk_error(__FILE__, __LINE__, (ret))
71
71