From c019323d0a13d51eddfcc9bc19004f9354c09fb1 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sat, 27 Aug 2011 18:24:37 +0000 Subject: [PATCH] * Addendum to r53472. This line is removed in Wine, so no need to consider sending this upstream. svn path=/trunk/; revision=53473 --- rostests/winetests/shell32/shlfileop.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/rostests/winetests/shell32/shlfileop.c b/rostests/winetests/shell32/shlfileop.c index 08867c87d6c..3e9a2e49e14 100644 --- a/rostests/winetests/shell32/shlfileop.c +++ b/rostests/winetests/shell32/shlfileop.c @@ -2309,8 +2309,6 @@ static void test_unicode(void) ok(!file_existsW(UNICODE_PATH), "The directory should have been removed\n"); } -extern HRESULT WINAPI Shell_MergeMenus (HMENU hmDst, HMENU hmSrc, UINT uInsert, UINT uIDAdjust, UINT uIDAdjustMax, ULONG uFlags); - static void test_shlmenu(void) { HRESULT hres;