diff options
| author | Arnon Gilboa <agilboa@redhat.com> | 2011-02-02 15:37:37 +0200 |
|---|---|---|
| committer | Arnon Gilboa <agilboa@redhat.com> | 2011-02-02 15:37:37 +0200 |
| commit | 845b158198216d19db9d3d0f8d761fa3fc60fe9c (patch) | |
| tree | a9d8ab28b2fdfb1c2787d5eee5e363fa8d354635 /include | |
| parent | 77738b71632939efa6f8d79b54772fcd7b88a81a (diff) | |
-fix types & casts for correctness in x64
-add #ifndef _WIN64 for all the SSE2/FPU/fast_memcpy stuff
-miniport/makefile: remove IFNDEF AMD64 to enable x64 build
-miniport/qxl.inf: add x64 support
Diffstat (limited to 'include')
| -rw-r--r-- | include/qxl_driver.h | 22 | ||||
| -rw-r--r-- | include/stdint.h | 4 |
2 files changed, 14 insertions, 12 deletions
diff --git a/include/qxl_driver.h b/include/qxl_driver.h index 728e2a2..b2e1c78 100644 --- a/include/qxl_driver.h +++ b/include/qxl_driver.h @@ -51,9 +51,9 @@ typedef struct QXLDriverInfo { QXLCommandRing *cmd_ring; QXLCursorRing *cursor_ring; QXLReleaseRing *release_ring; - UINT32 notify_cmd_port; - UINT32 notify_cursor_port; - UINT32 notify_oom_port; + PUCHAR notify_cmd_port; + PUCHAR notify_cursor_port; + PUCHAR notify_oom_port; PEVENT display_event; PEVENT cursor_event; PEVENT sleep_event; @@ -68,13 +68,13 @@ typedef struct QXLDriverInfo { UINT32 *update_id; UINT32 *compression_level; - UINT32 update_area_port; + PUCHAR update_area_port; QXLRect *update_area; UINT32 *update_surface; UINT32 *mm_clock; - UINT32 log_port; + PUCHAR log_port; UINT8 *log_buf; UINT32 *log_level; #if (WINVER < 0x0501) @@ -89,12 +89,12 @@ typedef struct QXLDriverInfo { UINT64 *ram_slot_end; MemSlot main_mem_slot; - UINT32 destroy_surface_wait_port; - UINT32 create_primary_port; - UINT32 destroy_primary_port; - UINT32 memslot_add_port; - UINT32 memslot_del_port; - UINT32 destroy_all_surfaces_port; + PUCHAR destroy_surface_wait_port; + PUCHAR create_primary_port; + PUCHAR destroy_primary_port; + PUCHAR memslot_add_port; + PUCHAR memslot_del_port; + PUCHAR destroy_all_surfaces_port; UINT32 dev_id; diff --git a/include/stdint.h b/include/stdint.h index 25920dc..f825d4b 100644 --- a/include/stdint.h +++ b/include/stdint.h @@ -136,11 +136,13 @@ typedef unsigned long long uint_fast64_t; /* 7.18.1.4 Integer types capable of holding object pointers */ +#ifndef _WIN64 + typedef int intptr_t; typedef unsigned uintptr_t; - +#endif /* 7.18.1.5 Greatest-width integer types */ |