summaryrefslogtreecommitdiff
path: root/onlineupdate
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-06-29 14:46:39 +0200
committerCaolán McNamara <caolanm@redhat.com>2016-06-29 14:49:19 +0000
commit42486dde49d9a9494c1f4889bbccde1f5aecd91e (patch)
tree8939d9e9f182ab9483775c4c6b84e85bb2208dde /onlineupdate
parentd5b05cafdec62209803e38010b3354660e3e67cd (diff)
move #includes to top of file
instead of being randomly embedded somewhere deep inside the CXX code. Found with: git grep -nP '^#include' -- *.cxx | sort -g -k 2 -t : Change-Id: I9ee432d3b665ecb6ec600bd51cc4b735a1b1127a Reviewed-on: https://gerrit.libreoffice.org/26764 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'onlineupdate')
-rw-r--r--onlineupdate/source/update/updater/updater.cxx15
1 files changed, 8 insertions, 7 deletions
diff --git a/onlineupdate/source/update/updater/updater.cxx b/onlineupdate/source/update/updater/updater.cxx
index 145e080fcbe2..136f06064219 100644
--- a/onlineupdate/source/update/updater/updater.cxx
+++ b/onlineupdate/source/update/updater/updater.cxx
@@ -57,6 +57,14 @@
#include <onlineupdate/mozilla/Compiler.h>
#include <onlineupdate/mozilla/Types.h>
+#ifdef _WIN32
+#include "nsWindowsRestart.cxx"
+#include "nsWindowsHelpers.h"
+#include "uachelper.h"
+#include "pathhash.h"
+#endif
+
+
// Amount of the progress bar to use in each of the 3 update stages,
// should total 100.0.
#define PROGRESS_PREPARE_SIZE 20.0f
@@ -1793,13 +1801,6 @@ PatchIfFile::Finish(int status)
//-----------------------------------------------------------------------------
-#ifdef _WIN32
-#include "nsWindowsRestart.cxx"
-#include "nsWindowsHelpers.h"
-#include "uachelper.h"
-#include "pathhash.h"
-#endif
-
static void
LaunchCallbackApp(const NS_tchar *workingDir,
int argc,