summaryrefslogtreecommitdiffstats
path: root/libmsi/string.c
diff options
context:
space:
mode:
authorPaolo Bonzini <pbonzini@redhat.com>2012-12-05 10:22:03 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2012-12-06 20:30:34 +0100
commit4e9a5dc18988790284a8ea66742338f4662c508c (patch)
tree5a56b6ff5ea3ec62b02a3b977d97d2a0afe07551 /libmsi/string.c
parent1222609fc5d9c980c1da9fb839f86455047c7c91 (diff)
downloadmsitools-4e9a5dc18988790284a8ea66742338f4662c508c.tar.gz
msitools-4e9a5dc18988790284a8ea66742338f4662c508c.tar.xz
msitools-4e9a5dc18988790284a8ea66742338f4662c508c.zip
eliminate Windows dependencies
Diffstat (limited to 'libmsi/string.c')
-rw-r--r--libmsi/string.c14
1 files changed, 3 insertions, 11 deletions
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 <stdarg.h>
#include <assert.h>
#include <gsf/gsf-msole-utils.h>
-#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;