diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-05-01 05:33:14 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-07-31 23:28:49 +0200 |
| commit | bf713ccf7474dd40cfc68454e3781f3236e2c60f (patch) | |
| tree | 4ed0a9760802e43466bc294b17ad1b4897ddfd66 /onlineupdate/source | |
| parent | b9471511523d5c80b80a5e99d149af65e9915840 (diff) | |
fix updater code on windows
Change-Id: Ic1e39bc8f4ef6afe8781ce62997201acba56680a
Reviewed-on: https://gerrit.libreoffice.org/40604
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'onlineupdate/source')
| -rw-r--r-- | onlineupdate/source/mbsdiff/bsdiff.cxx | 8 | ||||
| -rw-r--r-- | onlineupdate/source/update/updater/xpcom/glue/nsVersionComparator.cxx | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/onlineupdate/source/mbsdiff/bsdiff.cxx b/onlineupdate/source/mbsdiff/bsdiff.cxx index d455bf98046d..72bbcde1899f 100644 --- a/onlineupdate/source/mbsdiff/bsdiff.cxx +++ b/onlineupdate/source/mbsdiff/bsdiff.cxx @@ -23,7 +23,7 @@ #include <string.h> #include <fcntl.h> #include <stdarg.h> -#ifdef XP_WIN +#ifdef _WIN32 #include <io.h> #include <winsock2.h> #else @@ -213,10 +213,10 @@ int main(int argc,char *argv[]) { int fd; unsigned char *old = nullptr,*newbuf = nullptr; - int32_t oldsize = 0,newsize = 0; + int32_t oldsize = 0, newsize = 0; int32_t *I = nullptr,*V = nullptr; - int32_t scan,pos,len; + int32_t scan,pos = 0,len; int32_t lastscan,lastpos,lastoffset; int32_t oldscore,scsc; @@ -225,7 +225,7 @@ int main(int argc,char *argv[]) int32_t i; int32_t dblen,eblen; - unsigned char *db,*eb; + unsigned char *db,*eb = nullptr; unsigned int scrc; diff --git a/onlineupdate/source/update/updater/xpcom/glue/nsVersionComparator.cxx b/onlineupdate/source/update/updater/xpcom/glue/nsVersionComparator.cxx index 33c058982caf..def164d3808e 100644 --- a/onlineupdate/source/update/updater/xpcom/glue/nsVersionComparator.cxx +++ b/onlineupdate/source/update/updater/xpcom/glue/nsVersionComparator.cxx @@ -11,7 +11,7 @@ #include <stdint.h> #if defined(_WIN32) && !defined(UPDATER_NO_STRING_GLUE_STL) #include <wchar.h> -#include "mozilla/Char16.h" +#include "Char16.h" #endif #ifdef _WIN32 |