summaryrefslogtreecommitdiff
path: root/xmlsecurity
diff options
context:
space:
mode:
authorIvo Hinkelmann <ihi@openoffice.org>2007-04-17 09:24:34 +0000
committerIvo Hinkelmann <ihi@openoffice.org>2007-04-17 09:24:34 +0000
commita547f745b4b12e7a105dcd5dfb0e0ea2d8369b9b (patch)
tree2edd01e67d001e2cdfc3ecaffc359f2c4cafdd3b /xmlsecurity
parent2285f987ae007eeec5b5cc785c991f1bbfb19e52 (diff)
INTEGRATION: CWS jl51 (1.6.118); FILE MERGED
2007/02/06 16:38:12 jl 1.6.118.1: #i69228 warning free code
Diffstat (limited to 'xmlsecurity')
-rw-r--r--xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx13
1 files changed, 7 insertions, 6 deletions
diff --git a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
index 3093d07d680d..33d0c5a2ab68 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: securityenvironment_mscryptimpl.hxx,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: rt $ $Date: 2005-09-09 17:30:08 $
+ * last change: $Author: ihi $ $Date: 2007-04-17 10:24:34 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -36,6 +36,11 @@
#ifndef _XSECURITYENVIRONMENT_MSCRYPTIMPL_HXX_
#define _XSECURITYENVIRONMENT_MSCRYPTIMPL_HXX_
+#pragma warning(push,1)
+#include <windows.h>
+#include <wincrypt.h>
+#pragma warning(pop)
+
#ifndef _SAL_CONFIG_H_
#include <sal/config.h>
#endif
@@ -93,10 +98,6 @@
#endif
#include <list>
-
-#include <windows.h>
-#include <wincrypt.h>
-
#include "xmlsec/xmlsec.h"
class SecurityEnvironment_MSCryptImpl : public ::cppu::WeakImplHelper4<