summaryrefslogtreecommitdiff
path: root/setup_native
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2006-06-20 02:41:29 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2006-06-20 02:41:29 +0000
commitcc5e87024a233f800dd319423afe6369f5555e17 (patch)
tree61382109f021d7c4234d3bd9f4e79f1d7393b35b /setup_native
parent5ed669979473c91e0e2a5c355029d5996e90b211 (diff)
INTEGRATION: CWS warnings01 (1.3.18); FILE MERGED
2006/01/31 13:35:34 sb 1.3.18.1: #i53898# Made code warning-free.
Diffstat (limited to 'setup_native')
-rwxr-xr-xsetup_native/source/win32/customactions/shellextensions/iconcache.cxx8
1 files changed, 5 insertions, 3 deletions
diff --git a/setup_native/source/win32/customactions/shellextensions/iconcache.cxx b/setup_native/source/win32/customactions/shellextensions/iconcache.cxx
index 32d96f16aec1..26fb34031560 100755
--- a/setup_native/source/win32/customactions/shellextensions/iconcache.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/iconcache.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: iconcache.cxx,v $
*
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
- * last change: $Author: rt $ $Date: 2005-09-07 16:39:53 $
+ * last change: $Author: hr $ $Date: 2006-06-20 03:41:29 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -33,13 +33,15 @@
*
************************************************************************/
+#pragma warning(push, 1) /* disable warnings within system headers */
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <msiquery.h>
+#pragma warning(pop)
#include <stdlib.h>
-extern "C" UINT __stdcall RebuildShellIconCache(MSIHANDLE handle)
+extern "C" UINT __stdcall RebuildShellIconCache(MSIHANDLE)
{
// Rebuild icon cache on windows OS prior XP