[Libreoffice-commits] .: desktop/prj desktop/source

[Fridrich Strba]

 desktop/prj/build.lst                                      |    2 +-
 desktop/source/app/appsys.cxx                              |    2 ++
 desktop/source/app/lockfile.cxx                            |    2 ++
 desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx |    3 +++
 4 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit cb7cff8bca85fc4acd6e41acff70d9abe7b1084e
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Tue Mar 29 11:13:09 2011 +0200

    Fix desktop build on windows

diff --git a/desktop/prj/build.lst b/desktop/prj/build.lst
index 90a2762..2686c91 100755
--- a/desktop/prj/build.lst
+++ b/desktop/prj/build.lst
@@ -23,7 +23,7 @@ dt	desktop\win32\source\QuickStart\so	nmake	-	w	dt_win32_quickstart_so dt_win32_
 dt	desktop\os2\source\applauncher			nmake	-	p	dt_applauncher dt_inc NULL
 dt	desktop\unx\source\officeloader		nmake	-	u	dt_officeloader_unx dt_inc NULL
 dt     desktop\unx\source                      nmake   -       u       dt_uwrapper dt_pagein dt_inc NULL
-dt	desktop\source\pagein					nmake	-	all	dt_pagein dt_inc NULL
+dt	desktop\source\pagein					nmake	-	u	dt_pagein dt_inc NULL
 dt	desktop\source\pkgchk\unopkg			nmake	-	all	dt_unopkg dt_dp_misc dt_app dt_inc dt_guiloader.w NULL
 dt     desktop\unx\splash                      nmake   -       u       dt_usplash      dt_pagein.u dt_inc NULL
 dt	desktop\source\deployment				nmake	-	all	dt_deployment dt_dp_manager dt_dp_registry dt_dp_registry_package dt_dp_registry_executable dt_dp_registry_help dt_dp_registry_script dt_dp_registry_sfwk dt_dp_registry_component dt_dp_registry_configuration dt_dp_unopkg dt_inc dt_dp_misc NULL
diff --git a/desktop/source/app/appsys.cxx b/desktop/source/app/appsys.cxx
index d28ddae..e2856d5 100755
--- a/desktop/source/app/appsys.cxx
+++ b/desktop/source/app/appsys.cxx
@@ -37,6 +37,8 @@
 #include <tools/solar.h>
 #include <tools/urlobj.hxx>
 
+#include <windows.h>
+
 
 #define U2S(STRING)		::rtl::OUStringToOString(STRING, RTL_TEXTENCODING_UTF8)
 
diff --git a/desktop/source/app/lockfile.cxx b/desktop/source/app/lockfile.cxx
index 9819c24..8ac41ce 100755
--- a/desktop/source/app/lockfile.cxx
+++ b/desktop/source/app/lockfile.cxx
@@ -32,6 +32,8 @@
 #include <time.h>
 #ifndef WNT
 #include <unistd.h>
+#else
+#include <windows.h>
 #endif
 #include <sal/types.h>
 #include <osl/file.hxx>
diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
index 9696a95..973e430 100644
--- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx
@@ -102,7 +102,10 @@
 #endif
 
 #ifdef WNT
+#define GradientStyle_RECT BLA_GradientStyle_RECT
+#include <windows.h>
 #include <objbase.h>
+#undef GradientStyle_RECT
 #endif