summaryrefslogtreecommitdiffstats
path: root/sal
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2007-11-20 18:41:48 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2007-11-20 18:41:48 +0000
commit98df713ebb5156a5dd39fe11de4cf9f8a07dc087 (patch)
tree084fd504ce378268416c3187fbad57f04134dd41 /sal
parentINTEGRATION: CWS reportdesign01 (1.4.98); FILE MERGED (diff)
downloadcore-98df713ebb5156a5dd39fe11de4cf9f8a07dc087.tar.gz
core-98df713ebb5156a5dd39fe11de4cf9f8a07dc087.zip
INTEGRATION: CWS reportdesign01 (1.5.92); FILE MERGED
2007/10/15 09:09:23 oj 1.5.92.2: RESYNC: (1.5-1.6); FILE MERGED 2007/10/04 09:03:57 lla 1.5.92.1: #i67655# only updates on some tests to build warning free
Diffstat (limited to 'sal')
-rw-r--r--sal/qa/rtl/logfile/rtl_logfile.cxx14
1 files changed, 8 insertions, 6 deletions
diff --git a/sal/qa/rtl/logfile/rtl_logfile.cxx b/sal/qa/rtl/logfile/rtl_logfile.cxx
index 4a8f52a77e99..b2d437f91d6f 100644
--- a/sal/qa/rtl/logfile/rtl_logfile.cxx
+++ b/sal/qa/rtl/logfile/rtl_logfile.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: rtl_logfile.cxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: vg $ $Date: 2007-09-20 15:22:12 $
+ * last change: $Author: ihi $ $Date: 2007-11-20 19:41:48 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -60,11 +60,13 @@
#ifndef _OSL_FILE_HXX_
#include <osl/file.hxx>
#endif
-#ifdef WNT
-#define UNICODE
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
+#if ( defined WNT ) // Windows
+#include <tools/prewin.h>
+// #define UNICODE
+// #define WIN32_LEAN_AND_MEAN
+// #include <windows.h>
#include <tchar.h>
+#include <tools/postwin.h>
#endif
using namespace ::osl;