diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-01-19 09:23:59 -0600 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-01-19 09:23:59 -0600 |
| commit | a75e6678fe095147c7343ec9d0e772ae640f0e7a (patch) | |
| tree | ad88b97ec2cf01dcf47628e0fa1851636b289c92 /qemu-tool.c | |
| parent | b48c0134de96f3deed15a0e115d58f3cff09f3c1 (diff) | |
| parent | dcfa486817c12ea41165265cfaaa236d11968626 (diff) | |
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
* stefanha/trivial-patches:
Makefile: Remove generated headers on clean
Makefile: Exclude tests/Makefile in unconfigured tree
lm32: Fix mixup of uint32 and uint32_t
tests: Silence gtester in Makefile
qemu-tool: Fix mixup of int64 and int64_t
Diffstat (limited to 'qemu-tool.c')
| -rw-r--r-- | qemu-tool.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qemu-tool.c b/qemu-tool.c index c73bf7152e..6b69668258 100644 --- a/qemu-tool.c +++ b/qemu-tool.c @@ -59,12 +59,12 @@ void monitor_protocol_event(MonitorEvent event, QObject *data) { } -int64 cpu_get_clock(void) +int64_t cpu_get_clock(void) { abort(); } -int64 cpu_get_icount(void) +int64_t cpu_get_icount(void) { abort(); } |