summaryrefslogtreecommitdiff
path: root/sal/systools/win32/uwinapi/DllGetVersion.cpp
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2006-06-20 03:32:24 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2006-06-20 03:32:24 +0000
commit311b45996b6838e87bf03768d9bee58e10c0ad03 (patch)
tree9ae44a3be9d2150da344ebbd82f701a76572900c /sal/systools/win32/uwinapi/DllGetVersion.cpp
parent0df0bab70aa20e3a4ae4ba504304953cad711ea1 (diff)
INTEGRATION: CWS warnings01 (1.2.416); FILE MERGED
2005/12/02 08:23:03 sb 1.2.416.3: #i53898# Now globally disabled warning C4514: unreferenced inline function has been removed. 2005/09/23 01:34:35 sb 1.2.416.2: RESYNC: (1.2-1.3); FILE MERGED 2005/09/20 12:57:23 sb 1.2.416.1: #i53898# Globally disable problematic warnings.
Diffstat (limited to 'sal/systools/win32/uwinapi/DllGetVersion.cpp')
-rw-r--r--sal/systools/win32/uwinapi/DllGetVersion.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/sal/systools/win32/uwinapi/DllGetVersion.cpp b/sal/systools/win32/uwinapi/DllGetVersion.cpp
index 84c22eee3..28ff387a5 100644
--- a/sal/systools/win32/uwinapi/DllGetVersion.cpp
+++ b/sal/systools/win32/uwinapi/DllGetVersion.cpp
@@ -4,9 +4,9 @@
*
* $RCSfile: DllGetVersion.cpp,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: rt $ $Date: 2005-09-08 16:11:42 $
+ * last change: $Author: hr $ $Date: 2006-06-20 04:32:24 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -34,8 +34,10 @@
************************************************************************/
#define WIN32_LEAN_AND_MEAN
+#pragma warning(push,1)
#include <windows.h>
#include <shlwapi.h>
+#pragma warning(pop)
#include <malloc.h>
extern HMODULE UWINAPI_BaseAddress;