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 /hw | |
| 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 'hw')
| -rw-r--r-- | hw/milkymist-vgafb_template.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/milkymist-vgafb_template.h b/hw/milkymist-vgafb_template.h index 69af9ef3f..1d33ee8b5 100644 --- a/hw/milkymist-vgafb_template.h +++ b/hw/milkymist-vgafb_template.h @@ -39,7 +39,7 @@ #elif BITS == 24 #define COPY_PIXEL(to, r, g, b) \ do { \ - uint32 tmp = rgb_to_pixel24(r, g, b); \ + uint32_t tmp = rgb_to_pixel24(r, g, b); \ *(to++) = tmp & 0xff; \ *(to++) = (tmp >> 8) & 0xff; \ *(to++) = (tmp >> 16) & 0xff; \ |