From a246ab8b5e30b09705b485b6021c0149c80becda Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 4 Jan 2013 22:14:47 +0000
Subject: [PATCH] Attempt to fix MSVC6 compilation after the previous commit.

Include <shlobj.h> before our wx/msw/missing.h, otherwise many things were
redefined.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73345 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/common/filename.cpp | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/common/filename.cpp b/src/common/filename.cpp
index 6434bcbaef..6ffcbf1288 100644
--- a/src/common/filename.cpp
+++ b/src/common/filename.cpp
@@ -100,6 +100,7 @@
 
 #ifdef __WINDOWS__
     #include "wx/msw/private.h"
+    #include <shlobj.h>         // for CLSID_ShellLink
     #include "wx/msw/missing.h"
 #endif
 
@@ -1703,13 +1704,6 @@ bool wxFileName::ReplaceHomeDir(wxPathFormat format)
 // quotation marks."
 
 #if defined(__WIN32__) && !defined(__WXWINCE__) && wxUSE_OLE
-// The following lines are necessary under WinCE
-// #include "wx/msw/private.h"
-// #include <ole2.h>
-#include <shlobj.h>
-#if defined(__WXWINCE__)
-#include <shlguid.h>
-#endif
 
 bool wxFileName::GetShortcutTarget(const wxString& shortcutPath,
                                    wxString& targetFilename,
-- 
2.45.2