From 4ac72e4a9a8758e04e844f5d75fcbcddc452ff31 Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien
Date: Mon, 19 Jun 2006 12:56:22 +0000
Subject: INTEGRATION: CWS warnings01 (1.2.8); FILE MERGED 2006/02/24 14:49:18
sb 1.2.8.1: #i53898# Made code warning-free; removed dead code.
---
tools/win/inc/shutil.h | 8 ++++++--
tools/win/inc/winshell.hxx | 7 +++++--
2 files changed, 11 insertions(+), 4 deletions(-)
(limited to 'tools/win')
diff --git a/tools/win/inc/shutil.h b/tools/win/inc/shutil.h
index 4422ab7c8d05..1ee631a0af73 100644
--- a/tools/win/inc/shutil.h
+++ b/tools/win/inc/shutil.h
@@ -4,9 +4,9 @@
*
* $RCSfile: shutil.h,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: rt $ $Date: 2005-09-09 14:45:48 $
+ * last change: $Author: hr $ $Date: 2006-06-19 13:55:56 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -36,6 +36,8 @@
#ifndef _SHUTIL_H_
#define _SHUTIL_H_
+#if defined WNT
+
#ifndef _SHOBJ_H
#include
#endif
@@ -215,5 +217,7 @@ DWORD WINAPI WIN_SHDeleteValue(
}
#endif
+#endif
+
#endif // _SHUTIL_H_
diff --git a/tools/win/inc/winshell.hxx b/tools/win/inc/winshell.hxx
index f1ab158fe8b8..24e00db58633 100644
--- a/tools/win/inc/winshell.hxx
+++ b/tools/win/inc/winshell.hxx
@@ -4,9 +4,9 @@
*
* $RCSfile: winshell.hxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
- * last change: $Author: rt $ $Date: 2005-09-09 14:46:43 $
+ * last change: $Author: hr $ $Date: 2006-06-19 13:56:22 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -36,6 +36,8 @@
#ifndef _WINSHELL_HXX
#define _WINSHELL_HXX
+#if defined WNT
+
#include
#include "shutil.h"
#include
@@ -387,5 +389,6 @@ public:
virtual NotificationEvent WaitForChanges();
};
+#endif
#endif // _WINSHELL_HXX
--
cgit