From 73d6f4144fc246161652e43351253a7e9a8ef33e Mon Sep 17 00:00:00 2001
From: Paolo Bonzini <pbonzini@redhat.com>
Date: Tue, 23 Oct 2012 10:31:27 +0200
Subject: get rid of P/LP types

---
 libmsi/query.h | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'libmsi/query.h')

diff --git a/libmsi/query.h b/libmsi/query.h
index 7350896..16a7d1c 100644
--- a/libmsi/query.h
+++ b/libmsi/query.h
@@ -58,7 +58,7 @@
 #define EXPR_UNARY    12
 
 struct sql_str {
-    LPCWSTR data;
+    const WCHAR *data;
     INT len;
 };
 
@@ -74,8 +74,8 @@ union ext_column
 {
     struct
     {
-        LPCWSTR column;
-        LPCWSTR table;
+        const WCHAR *column;
+        const WCHAR *table;
     } unparsed;
     struct
     {
@@ -92,15 +92,15 @@ struct expr
         struct complex_expr expr;
         INT   ival;
         UINT  uval;
-        LPCWSTR sval;
+        const WCHAR *sval;
         union ext_column column;
     } u;
 };
 
-UINT MSI_ParseSQL( MSIDATABASE *db, LPCWSTR command, MSIVIEW **phview,
+UINT MSI_ParseSQL( MSIDATABASE *db, const WCHAR *command, MSIVIEW **phview,
                    struct list *mem );
 
-UINT TABLE_CreateView( MSIDATABASE *db, LPCWSTR name, MSIVIEW **view );
+UINT TABLE_CreateView( MSIDATABASE *db, const WCHAR *name, MSIVIEW **view );
 
 UINT SELECT_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table,
                         const column_info *columns );
@@ -110,33 +110,33 @@ UINT DISTINCT_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table );
 UINT ORDER_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table,
                        column_info *columns );
 
-UINT WHERE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPWSTR tables,
+UINT WHERE_CreateView( MSIDATABASE *db, MSIVIEW **view, WCHAR *tables,
                        struct expr *cond );
 
-UINT CREATE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR table,
+UINT CREATE_CreateView( MSIDATABASE *db, MSIVIEW **view, const WCHAR *table,
                         column_info *col_info, BOOL hold );
 
-UINT INSERT_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR table,
+UINT INSERT_CreateView( MSIDATABASE *db, MSIVIEW **view, const WCHAR *table,
                         column_info *columns, column_info *values, BOOL temp );
 
-UINT UPDATE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPWSTR table,
+UINT UPDATE_CreateView( MSIDATABASE *db, MSIVIEW **view, WCHAR *table,
                         column_info *list, struct expr *expr );
 
 UINT DELETE_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table );
 
-UINT ALTER_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR name, column_info *colinfo, int hold );
+UINT ALTER_CreateView( MSIDATABASE *db, MSIVIEW **view, const WCHAR *name, column_info *colinfo, int hold );
 
 UINT STREAMS_CreateView( MSIDATABASE *db, MSIVIEW **view );
 
 UINT STORAGES_CreateView( MSIDATABASE *db, MSIVIEW **view );
 
-UINT DROP_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR name );
+UINT DROP_CreateView( MSIDATABASE *db, MSIVIEW **view, const WCHAR *name );
 
 int sqliteGetToken(const WCHAR *z, int *tokenType, int *skip);
 
 MSIRECORD *msi_query_merge_record( UINT fields, const column_info *vl, MSIRECORD *rec );
 
-UINT msi_create_table( MSIDATABASE *db, LPCWSTR name, column_info *col_info,
+UINT msi_create_table( MSIDATABASE *db, const WCHAR *name, column_info *col_info,
                        MSICONDITION persistent );
 
 #pragma GCC visibility pop
-- 
cgit