summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2007-09-06 13:14:31 +0000
committerKurt Zenker <kz@openoffice.org>2007-09-06 13:14:31 +0000
commit71c6cb84bc26f62c74138d8bff2cc926ed5889d6 (patch)
tree120a98c03228d18691a8d65558abddbbb8a73c34
parentc3ff4f3412959886ff76c60507c8901a9d3608df (diff)
INTEGRATION: CWS mingwport06 (1.13.14); FILE MERGED
2007/08/27 14:34:48 vg 1.13.14.1: #i75499# pragma for MSVC
-rw-r--r--tools/source/datetime/ttime.cxx8
1 files changed, 6 insertions, 2 deletions
diff --git a/tools/source/datetime/ttime.cxx b/tools/source/datetime/ttime.cxx
index 265b0e1e3234..baf8f7681498 100644
--- a/tools/source/datetime/ttime.cxx
+++ b/tools/source/datetime/ttime.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: ttime.cxx,v $
*
- * $Revision: 1.13 $
+ * $Revision: 1.14 $
*
- * last change: $Author: obo $ $Date: 2007-07-18 08:57:39 $
+ * last change: $Author: kz $ $Date: 2007-09-06 14:14:31 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -39,9 +39,13 @@
#define _TOOLS_TIME_CXX
#if defined WNT
+#ifdef _MSC_VER
#pragma warning (push,1)
+#endif
#include <tools/svwin.h>
+#ifdef _MSC_VER
#pragma warning (pop)
+#endif
#elif defined UNX
#include <unistd.h>
#include <limits.h>