diff options
-rw-r--r-- | libmsi/Makefile.am | 5 | ||||
-rw-r--r-- | libmsi/alter.c | 2 | ||||
-rw-r--r-- | libmsi/create.c | 4 | ||||
-rw-r--r-- | libmsi/database.c | 4 | ||||
-rw-r--r-- | libmsi/debug.h (renamed from libmsi/wine/debug.h) | 0 | ||||
-rw-r--r-- | libmsi/delete.c | 2 | ||||
-rw-r--r-- | libmsi/distinct.c | 2 | ||||
-rw-r--r-- | libmsi/drop.c | 2 | ||||
-rw-r--r-- | libmsi/handle.c | 2 | ||||
-rw-r--r-- | libmsi/insert.c | 4 | ||||
-rw-r--r-- | libmsi/list.h (renamed from libmsi/wine/list.h) | 0 | ||||
-rw-r--r-- | libmsi/msipriv.h | 4 | ||||
-rw-r--r-- | libmsi/msiquery.c | 4 | ||||
-rw-r--r-- | libmsi/query.h | 2 | ||||
-rw-r--r-- | libmsi/record.c | 4 | ||||
-rw-r--r-- | libmsi/select.c | 2 | ||||
-rw-r--r-- | libmsi/sql-parser.y | 6 | ||||
-rw-r--r-- | libmsi/storages.c | 2 | ||||
-rw-r--r-- | libmsi/streams.c | 4 | ||||
-rw-r--r-- | libmsi/string.c | 4 | ||||
-rw-r--r-- | libmsi/suminfo.c | 4 | ||||
-rw-r--r-- | libmsi/table.c | 4 | ||||
-rw-r--r-- | libmsi/tokenize.c | 2 | ||||
-rw-r--r-- | libmsi/unicode.h (renamed from libmsi/wine/unicode.h) | 0 | ||||
-rw-r--r-- | libmsi/update.c | 2 | ||||
-rw-r--r-- | libmsi/utf16/snprintfW.c | 2 | ||||
-rw-r--r-- | libmsi/utf16/sprintfW.c | 2 | ||||
-rw-r--r-- | libmsi/utf16/strtolW.c | 2 | ||||
-rw-r--r-- | libmsi/where.c | 4 |
29 files changed, 42 insertions, 39 deletions
diff --git a/libmsi/Makefile.am b/libmsi/Makefile.am index 85004cc..9adfe03 100644 --- a/libmsi/Makefile.am +++ b/libmsi/Makefile.am @@ -6,10 +6,13 @@ AM_YFLAGS = -d BUILT_SOURCES = sql-parser.c sql-parser.h noinst_HEADERS = \ + debug.h \ + list.h \ msipriv.h \ msiquery.h \ msiserver.h \ - query.h + query.h \ + unicode.h libmsi_la_SOURCES = alter.c create.c database.c delete.c distinct.c \ drop.c handle.c insert.c msiquery.c record.c select.c storages.c \ diff --git a/libmsi/alter.c b/libmsi/alter.c index 8873117..c484762 100644 --- a/libmsi/alter.c +++ b/libmsi/alter.c @@ -23,7 +23,7 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" -#include "wine/debug.h" +#include "debug.h" #include "msiquery.h" #include "objbase.h" #include "objidl.h" diff --git a/libmsi/create.c b/libmsi/create.c index cb00366..082fcf1 100644 --- a/libmsi/create.c +++ b/libmsi/create.c @@ -23,8 +23,8 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include "debug.h" +#include "unicode.h" #include "msiquery.h" #include "objbase.h" #include "objidl.h" diff --git a/libmsi/database.c b/libmsi/database.c index 6f9f11b..59c5cf4 100644 --- a/libmsi/database.c +++ b/libmsi/database.c @@ -28,8 +28,8 @@ #include "winbase.h" #include "winreg.h" #include "winnls.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include "debug.h" +#include "unicode.h" #include "msiquery.h" #include "msipriv.h" #include "objidl.h" diff --git a/libmsi/wine/debug.h b/libmsi/debug.h index cb5da28..cb5da28 100644 --- a/libmsi/wine/debug.h +++ b/libmsi/debug.h diff --git a/libmsi/delete.c b/libmsi/delete.c index d7ce262..59dc1db 100644 --- a/libmsi/delete.c +++ b/libmsi/delete.c @@ -23,7 +23,7 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" -#include "wine/debug.h" +#include "debug.h" #include "msiquery.h" #include "objbase.h" #include "objidl.h" diff --git a/libmsi/distinct.c b/libmsi/distinct.c index dba58d8..31858fb 100644 --- a/libmsi/distinct.c +++ b/libmsi/distinct.c @@ -23,7 +23,7 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" -#include "wine/debug.h" +#include "debug.h" #include "msiquery.h" #include "objbase.h" #include "objidl.h" diff --git a/libmsi/drop.c b/libmsi/drop.c index e2566fb..88b360a 100644 --- a/libmsi/drop.c +++ b/libmsi/drop.c @@ -23,7 +23,7 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" -#include "wine/debug.h" +#include "debug.h" #include "msiquery.h" #include "objbase.h" #include "objidl.h" diff --git a/libmsi/handle.c b/libmsi/handle.c index 497ee8e..4d8ded2 100644 --- a/libmsi/handle.c +++ b/libmsi/handle.c @@ -26,7 +26,7 @@ #include "winbase.h" #include "winreg.h" #include "shlwapi.h" -#include "wine/debug.h" +#include "debug.h" #include "msiquery.h" #include "msipriv.h" diff --git a/libmsi/insert.c b/libmsi/insert.c index d16aacd..eea54c6 100644 --- a/libmsi/insert.c +++ b/libmsi/insert.c @@ -23,8 +23,8 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include "debug.h" +#include "unicode.h" #include "msiquery.h" #include "objbase.h" #include "objidl.h" diff --git a/libmsi/wine/list.h b/libmsi/list.h index 9712603..9712603 100644 --- a/libmsi/wine/list.h +++ b/libmsi/list.h diff --git a/libmsi/msipriv.h b/libmsi/msipriv.h index 18e0c2b..26b572c 100644 --- a/libmsi/msipriv.h +++ b/libmsi/msipriv.h @@ -24,7 +24,7 @@ #include <stdarg.h> -#include "wine/unicode.h" +#include "unicode.h" #include "windef.h" #include "winbase.h" #include "fdi.h" @@ -38,7 +38,7 @@ #include "fusion.h" #include "winnls.h" #include "winver.h" -#include "wine/list.h" +#include "list.h" #pragma GCC visibility push(hidden) diff --git a/libmsi/msiquery.c b/libmsi/msiquery.c index 37286d3..8257ebf 100644 --- a/libmsi/msiquery.c +++ b/libmsi/msiquery.c @@ -25,8 +25,8 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include "debug.h" +#include "unicode.h" #include "msiquery.h" #include "objbase.h" #include "objidl.h" diff --git a/libmsi/query.h b/libmsi/query.h index 07e068e..7350896 100644 --- a/libmsi/query.h +++ b/libmsi/query.h @@ -30,7 +30,7 @@ #include "msi.h" #include "msiquery.h" #include "msipriv.h" -#include "wine/list.h" +#include "list.h" #pragma GCC visibility push(hidden) diff --git a/libmsi/record.c b/libmsi/record.c index 4423b12..78e27ff 100644 --- a/libmsi/record.c +++ b/libmsi/record.c @@ -27,8 +27,8 @@ #include "wingdi.h" #include "winuser.h" #include "winerror.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include "debug.h" +#include "unicode.h" #include "msiquery.h" #include "msipriv.h" #include "objidl.h" diff --git a/libmsi/select.c b/libmsi/select.c index 7978ed3..2474328 100644 --- a/libmsi/select.c +++ b/libmsi/select.c @@ -23,7 +23,7 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" -#include "wine/debug.h" +#include "debug.h" #include "msiquery.h" #include "objbase.h" #include "objidl.h" diff --git a/libmsi/sql-parser.y b/libmsi/sql-parser.y index 5bd1721..ab28ed9 100644 --- a/libmsi/sql-parser.y +++ b/libmsi/sql-parser.y @@ -30,9 +30,9 @@ #include "windef.h" #include "winbase.h" #include "query.h" -#include "wine/list.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include "list.h" +#include "debug.h" +#include "unicode.h" #define YYLEX_PARAM info #define YYPARSE_PARAM info diff --git a/libmsi/storages.c b/libmsi/storages.c index 042d33d..e4f8af3 100644 --- a/libmsi/storages.c +++ b/libmsi/storages.c @@ -33,7 +33,7 @@ #include "msipriv.h" #include "query.h" -#include "wine/debug.h" +#include "debug.h" #define NUM_STORAGES_COLS 2 diff --git a/libmsi/streams.c b/libmsi/streams.c index 56ad54a..187e44d 100644 --- a/libmsi/streams.c +++ b/libmsi/streams.c @@ -30,8 +30,8 @@ #include "msipriv.h" #include "query.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include "debug.h" +#include "unicode.h" #define NUM_STREAMS_COLS 2 diff --git a/libmsi/string.c b/libmsi/string.c index 53285da..40d9c1e 100644 --- a/libmsi/string.c +++ b/libmsi/string.c @@ -28,8 +28,8 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include "debug.h" +#include "unicode.h" #include "msiquery.h" #include "objbase.h" #include "objidl.h" diff --git a/libmsi/suminfo.c b/libmsi/suminfo.c index 7c12717..01f17a1 100644 --- a/libmsi/suminfo.c +++ b/libmsi/suminfo.c @@ -28,8 +28,8 @@ #include "winreg.h" #include "winnls.h" #include "shlwapi.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include "debug.h" +#include "unicode.h" #include "msiquery.h" #include "msidefs.h" #include "msipriv.h" diff --git a/libmsi/table.c b/libmsi/table.c index 6fe7ff4..f6a170c 100644 --- a/libmsi/table.c +++ b/libmsi/table.c @@ -35,8 +35,8 @@ #include "msipriv.h" #include "query.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include "debug.h" +#include "unicode.h" #define MSITABLE_HASH_TABLE_SIZE 37 diff --git a/libmsi/tokenize.c b/libmsi/tokenize.c index ca17727..8ae62a8 100644 --- a/libmsi/tokenize.c +++ b/libmsi/tokenize.c @@ -22,7 +22,7 @@ #include "windef.h" #include "winbase.h" -#include "wine/unicode.h" +#include "unicode.h" #include "query.h" #include "sql-parser.h" diff --git a/libmsi/wine/unicode.h b/libmsi/unicode.h index d113453..d113453 100644 --- a/libmsi/wine/unicode.h +++ b/libmsi/unicode.h diff --git a/libmsi/update.c b/libmsi/update.c index 7f74ec8..357c496 100644 --- a/libmsi/update.c +++ b/libmsi/update.c @@ -23,7 +23,7 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" -#include "wine/debug.h" +#include "debug.h" #include "msiquery.h" #include "objbase.h" #include "objidl.h" diff --git a/libmsi/utf16/snprintfW.c b/libmsi/utf16/snprintfW.c index 9a9a1b8..3e3ee05 100644 --- a/libmsi/utf16/snprintfW.c +++ b/libmsi/utf16/snprintfW.c @@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <wine/unicode.h> +#include "unicode.h" #include <stdarg.h> #include <stdlib.h> diff --git a/libmsi/utf16/sprintfW.c b/libmsi/utf16/sprintfW.c index b7c5498..ebb8909 100644 --- a/libmsi/utf16/sprintfW.c +++ b/libmsi/utf16/sprintfW.c @@ -15,7 +15,7 @@ You should have received a copy of the GNU Lesser General Public License along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include <wine/unicode.h> +#include "unicode.h" #include <stdarg.h> #include <limits.h> diff --git a/libmsi/utf16/strtolW.c b/libmsi/utf16/strtolW.c index c311a69..5c2a818 100644 --- a/libmsi/utf16/strtolW.c +++ b/libmsi/utf16/strtolW.c @@ -25,7 +25,7 @@ # include <config.h> #endif -#include <wine/unicode.h> +#include "unicode.h" #include <errno.h> #ifndef __set_errno # define __set_errno(Val) errno = (Val) diff --git a/libmsi/where.c b/libmsi/where.c index 933d971..c1311f0 100644 --- a/libmsi/where.c +++ b/libmsi/where.c @@ -25,8 +25,8 @@ #include "windef.h" #include "winbase.h" #include "winerror.h" -#include "wine/debug.h" -#include "wine/unicode.h" +#include "debug.h" +#include "unicode.h" #include "msiquery.h" #include "objbase.h" #include "objidl.h" |