From 4e9a5dc18988790284a8ea66742338f4662c508c Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Wed, 5 Dec 2012 10:22:03 +0100 Subject: eliminate Windows dependencies --- libmsi/string.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'libmsi/string.c') diff --git a/libmsi/string.c b/libmsi/string.c index c894d06..2f3d144 100644 --- a/libmsi/string.c +++ b/libmsi/string.c @@ -20,25 +20,17 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#define COBJMACROS - #include #include #include -#include "windef.h" -#include "winbase.h" -#include "winerror.h" #include "debug.h" -#include "unicode.h" #include "libmsi.h" -#include "objbase.h" -#include "objidl.h" #include "msipriv.h" -#include "winnls.h" #include "query.h" +#define CP_ACP 0 struct msistring { @@ -60,7 +52,7 @@ struct string_table static bool validate_codepage( unsigned codepage ) { switch (codepage) { - case 0: /* CP_ACP */ + case CP_ACP: case 37: case 424: case 437: case 500: case 737: case 775: case 850: case 852: case 855: case 856: case 857: case 860: case 861: case 862: case 863: case 864: case 865: case 866: case 869: case 874: case 875: @@ -115,7 +107,7 @@ static string_table *init_stringtable( int entries, unsigned codepage ) return st; } -VOID msi_destroy_stringtable( string_table *st ) +void msi_destroy_stringtable( string_table *st ) { unsigned i; -- cgit