summaryrefslogtreecommitdiff
path: root/sal/osl/w32
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2006-06-20 03:21:09 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2006-06-20 03:21:09 +0000
commit8c43ba45e5cd7e020dfc7a79396a306295f5ecd5 (patch)
treeaa1cdf5c0e7250265fd57c08bce1d3d04e25235a /sal/osl/w32
parentfbfbcaec273822e2afb2d635d8f7f3bebdd52e8e (diff)
INTEGRATION: CWS warnings01 (1.8.346); FILE MERGED
2005/09/23 00:59:32 sb 1.8.346.2: RESYNC: (1.8-1.9); FILE MERGED 2005/09/20 12:57:19 sb 1.8.346.1: #i53898# Globally disable problematic warnings.
Diffstat (limited to 'sal/osl/w32')
-rw-r--r--sal/osl/w32/nlsupport.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/sal/osl/w32/nlsupport.c b/sal/osl/w32/nlsupport.c
index ddfeb5767adf..2676730ce1fc 100644
--- a/sal/osl/w32/nlsupport.c
+++ b/sal/osl/w32/nlsupport.c
@@ -4,9 +4,9 @@
*
* $RCSfile: nlsupport.c,v $
*
- * $Revision: 1.9 $
+ * $Revision: 1.10 $
*
- * last change: $Author: rt $ $Date: 2005-09-08 15:07:59 $
+ * last change: $Author: hr $ $Date: 2006-06-20 04:21:09 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -34,7 +34,9 @@
************************************************************************/
#define UNICODE
+#pragma warning(push,1) /* disable warnings within system headers */
#include <windows.h>
+#pragma warning(pop)
#include <wchar.h>
#include <osl/mutex.h>