[PATCH 1/1] include: Always declare the imagelist read and write functions.

[Huw Davies]

From: Huw Davies

This matches the PSDK.
---
 include/commctrl.h | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/include/commctrl.h b/include/commctrl.h
index ece751a0d35..c84dce3702c 100644
--- a/include/commctrl.h
+++ b/include/commctrl.h
@@ -601,14 +601,13 @@ WINCOMMCTRLAPI BOOL       WINAPI ImageList_SetIconSize(HIMAGELIST,INT,INT);
 WINCOMMCTRLAPI BOOL       WINAPI ImageList_SetImageCount(HIMAGELIST,UINT);
 WINCOMMCTRLAPI BOOL       WINAPI ImageList_SetOverlayImage(HIMAGELIST,INT,INT);

-#ifdef __IStream_INTERFACE_DEFINED__
-WINCOMMCTRLAPI HIMAGELIST WINAPI ImageList_Read(LPSTREAM);
-WINCOMMCTRLAPI BOOL       WINAPI ImageList_Write(HIMAGELIST,IStream*);
-WINCOMMCTRLAPI HRESULT    WINAPI ImageList_WriteEx(HIMAGELIST,DWORD,IStream*);
+struct IStream;
+WINCOMMCTRLAPI HIMAGELIST WINAPI ImageList_Read(struct IStream*);
+WINCOMMCTRLAPI BOOL       WINAPI ImageList_Write(HIMAGELIST,struct IStream*);
+WINCOMMCTRLAPI HRESULT    WINAPI ImageList_WriteEx(HIMAGELIST,DWORD,struct IStream*);

#define ILP_NORMAL    0
 #define ILP_DOWNLEVEL 1
-#endif

#define ImageList_AddIcon(himl,hicon) ImageList_ReplaceIcon(himl,-1,hicon)
 #define ImageList_ExtractIcon(hi,himl,i) ImageList_GetIcon(himl,i,0)