diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2012-12-05 10:22:03 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2012-12-06 20:30:34 +0100 |
| commit | 4e9a5dc18988790284a8ea66742338f4662c508c (patch) | |
| tree | 5a56b6ff5ea3ec62b02a3b977d97d2a0afe07551 /libmsi/streams.c | |
| parent | 1222609fc5d9c980c1da9fb839f86455047c7c91 (diff) | |
| download | msitools-4e9a5dc18988790284a8ea66742338f4662c508c.tar.gz msitools-4e9a5dc18988790284a8ea66742338f4662c508c.tar.xz msitools-4e9a5dc18988790284a8ea66742338f4662c508c.zip | |
eliminate Windows dependencies
Diffstat (limited to 'libmsi/streams.c')
| -rw-r--r-- | libmsi/streams.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/libmsi/streams.c b/libmsi/streams.c index 1858baf..39e2630 100644 --- a/libmsi/streams.c +++ b/libmsi/streams.c @@ -20,18 +20,11 @@ #include <stdarg.h> -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "winerror.h" #include "libmsi.h" -#include "objbase.h" #include "msipriv.h" #include "query.h" #include "debug.h" -#include "unicode.h" #define NUM_STREAMS_COLS 2 @@ -307,7 +300,7 @@ static unsigned streams_view_find_matching_rows(LibmsiView *view, unsigned col, unsigned val, unsigned *row, MSIITERHANDLE *handle) { LibmsiStreamsView *sv = (LibmsiStreamsView *)view; - unsigned index = PtrToUlong(*handle); + unsigned index = (uintptr_t)(*handle); TRACE("(%p, %d, %d, %p, %p)\n", view, col, val, row, handle); @@ -325,7 +318,7 @@ static unsigned streams_view_find_matching_rows(LibmsiView *view, unsigned col, index++; } - *handle = UlongToPtr(++index); + *handle = (MSIITERHANDLE)(uintptr_t)++index; if (index > sv->num_rows) return LIBMSI_RESULT_NO_MORE_ITEMS; |