diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2012-12-10 17:30:32 +0100 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2012-12-10 17:30:32 +0100 |
commit | 9a1151d6474ac7daebc263edc2f37caf3b4c9955 (patch) | |
tree | d11965d58c2eb20c0470fc5f9c25de42ab545375 /libmsi/where.c | |
parent | 2ea5d49da27c3569251896884786649a72bd6df3 (diff) | |
parent | 6b7407cb031cf245a4998d8c79009039ead38fc5 (diff) | |
download | msitools-9a1151d6474ac7daebc263edc2f37caf3b4c9955.tar.gz msitools-9a1151d6474ac7daebc263edc2f37caf3b4c9955.tar.xz msitools-9a1151d6474ac7daebc263edc2f37caf3b4c9955.zip |
Merge branch 'pre-gsf'
Conflicts:
libmsi/Makefile.am
libmsi/libmsi-summary-info.c
libmsi/msipriv.h
Diffstat (limited to 'libmsi/where.c')
-rw-r--r-- | libmsi/where.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libmsi/where.c b/libmsi/where.c index c9231ed..003679b 100644 --- a/libmsi/where.c +++ b/libmsi/where.c @@ -30,9 +30,9 @@ /* below is the query interface to a table */ -typedef struct LibmsiRowEntry +typedef struct _LibmsiRowEntry { - struct LibmsiWhereView *wv; /* used during sorting */ + struct _LibmsiWhereView *wv; /* used during sorting */ unsigned values[1]; } LibmsiRowEntry; @@ -45,14 +45,14 @@ typedef struct tagJOINTABLE unsigned table_index; } JOINTABLE; -typedef struct LibmsiOrderInfo +typedef struct _LibmsiOrderInfo { unsigned col_count; unsigned error; union ext_column columns[1]; } LibmsiOrderInfo; -typedef struct LibmsiWhereView +typedef struct _LibmsiWhereView { LibmsiView view; LibmsiDatabase *db; |