summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Ostrovsky <david@ostrovsky.org>2015-02-18 22:12:48 +0100
committerMichael Stahl <mstahl@redhat.com>2015-02-19 22:25:21 +0000
commitc4e37b8ec409333663e7d712e1863ca1e0efffab (patch)
tree2c2e7e265d41999c420529a2157d0503060a95cd
parent2296563c861f0ec0bb209c7250eb49a4a34f6852 (diff)
ODK: Fix WError on windows x64 bit
Change-Id: I39534e171806d47e154c82de89b8b9e3883771b4 Reviewed-on: https://gerrit.libreoffice.org/14541 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
-rwxr-xr-x[-rw-r--r--]odk/source/unoapploader/win/unoapploader.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/odk/source/unoapploader/win/unoapploader.c b/odk/source/unoapploader/win/unoapploader.c
index ab953990a07a..36ae8caff74f 100644..100755
--- a/odk/source/unoapploader/win/unoapploader.c
+++ b/odk/source/unoapploader/win/unoapploader.c
@@ -72,7 +72,7 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
char* value = NULL;
char* envstr = NULL;
char* cmdline = NULL;
- int size;
+ size_t size;
STARTUPINFO startup_info;
PROCESS_INFORMATION process_info;
BOOL bCreate;
@@ -136,8 +136,8 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
if (ret != 0) {
char * buf = NULL;
char * tmp;
- size_t n = 1000;
- size_t k = 0;
+ DWORD n = 1000;
+ DWORD k = 0;
DWORD exitcode;
int path2size;
CloseHandle(stdoutWrite);
@@ -168,7 +168,7 @@ int WINAPI WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance,
}
k += m;
if (k >= n) {
- if (n >= SAL_MAX_SIZE / 2) {
+ if (n >= MAXDWORD / 2) {
writeError(
"Error: out of memory reading unoinfo output!\n");
closeErrorFile();