Hi,
This patch fix compile error in commctrl.h
Ok for apply?
Regards,
Dongsheng
From 8b0831b0a5b778379f50023e6c8e16c8851f8a43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E5=86=AC=E7=94=9F?= <[email protected]>
Date: Wed, 3 Sep 2014 10:57:19 +0800
Subject: [PATCH] Fix compile error in commctrl.h
---
mingw-w64-headers/include/commctrl.h | 55 +++++++++++++++++-----------------
1 file changed, 28 insertions(+), 27 deletions(-)
diff --git a/mingw-w64-headers/include/commctrl.h
b/mingw-w64-headers/include/commctrl.h
index 8e694fc..3c51da3 100644
--- a/mingw-w64-headers/include/commctrl.h
+++ b/mingw-w64-headers/include/commctrl.h
@@ -2194,6 +2194,33 @@ extern "C" {
#define CCS_RIGHT (CCS_VERT | CCS_BOTTOM)
#define CCS_NOMOVEX (CCS_VERT | CCS_NOMOVEY)
+#ifdef _WIN32
+#define INVALID_LINK_INDEX (-1)
+#define MAX_LINKID_TEXT 48
+#define L_MAX_URL_LENGTH (2048+32+sizeof("://"))
+
+#define WC_LINK L"SysLink"
+
+ typedef struct tagLITEM {
+ UINT mask;
+ int iLink;
+ UINT state;
+ UINT stateMask;
+ WCHAR szID[MAX_LINKID_TEXT];
+ WCHAR szUrl[L_MAX_URL_LENGTH];
+ } LITEM,*PLITEM;
+
+ typedef struct tagLHITTESTINFO {
+ POINT pt;
+ LITEM item;
+ } LHITTESTINFO,*PLHITTESTINFO;
+
+ typedef struct tagNMLINK {
+ NMHDR hdr;
+ LITEM item;
+ } NMLINK,*PNMLINK;
+#endif
+
#ifndef NOLISTVIEW
#define WC_LISTVIEWA "SysListView32"
@@ -5109,12 +5136,6 @@ typedef struct tagTVDISPINFOEXW {
#endif
-#define INVALID_LINK_INDEX (-1)
-#define MAX_LINKID_TEXT 48
-#define L_MAX_URL_LENGTH (2048+32+sizeof("://"))
-
-#define WC_LINK L"SysLink"
-
#define LWS_TRANSPARENT 0x1
#define LWS_IGNORERETURN 0x2
#if NTDDI_VERSION >= 0x06000000
@@ -5136,25 +5157,6 @@ typedef struct tagTVDISPINFOEXW {
#define LIS_DEFAULTCOLORS 0x10
#endif
- typedef struct tagLITEM {
- UINT mask;
- int iLink;
- UINT state;
- UINT stateMask;
- WCHAR szID[MAX_LINKID_TEXT];
- WCHAR szUrl[L_MAX_URL_LENGTH];
- } LITEM,*PLITEM;
-
- typedef struct tagLHITTESTINFO {
- POINT pt;
- LITEM item;
- } LHITTESTINFO,*PLHITTESTINFO;
-
- typedef struct tagNMLINK {
- NMHDR hdr;
- LITEM item;
- } NMLINK,*PNMLINK;
-
#define LM_HITTEST (WM_USER+0x300)
#define LM_GETIDEALHEIGHT (WM_USER+0x301)
#define LM_SETITEM (WM_USER+0x302)
@@ -5343,8 +5345,7 @@ typedef struct tagTVDISPINFOEXW {
#if NTDDI_VERSION >= 0x06000000
WINCOMMCTRLAPI HDSA WINAPI DSA_Clone (HDSA hdsa);
WINCOMMCTRLAPI ULONGLONG WINAPI DSA_GetSize (HDSA hdsa);
- WINCOMMCTRLAPI WINBOOL WINAPI DSA_Sort (HDSA pdsa, PFNDACOMPARE pfnCompare,
LP
-ARAM lParam);
+ WINCOMMCTRLAPI WINBOOL WINAPI DSA_Sort (HDSA pdsa, PFNDACOMPARE pfnCompare,
LPARAM lParam);
#ifdef __cplusplus
extern "C++" __inline WINBOOL DSA_Sort (HDSA hdsa, PFNDACOMPARECONST
pfnCompare, LPARAM lParam) {
return DSA_Sort (hdsa,(PFNDACOMPARE) (pfnCompare), lParam);
--
1.7.10.4
------------------------------------------------------------------------------
Slashdot TV.
Video for Nerds. Stuff that matters.
http://tv.slashdot.org/
_______________________________________________
Mingw-w64-public mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
