diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 21a5489f0..64f736a63 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-22  Chris Sutcliffe  <ir0nh34d@users.sf.net>
+
+	* include/wingdi.h (GCP_RESULTSW):  Correct defintion.
+
+	Thanks to Albrecht Schlosser for the report and the fix.
+
 2011-05-15  Corinna Vinschen  <corinna@vinschen.de>
 
 	* include/winbase.h (STACK_SIZE_PARAM_IS_A_RESERVATION): Define.
diff --git a/winsup/w32api/include/wingdi.h b/winsup/w32api/include/wingdi.h
index f6ac0f1bb..9ecbd517a 100644
--- a/winsup/w32api/include/wingdi.h
+++ b/winsup/w32api/include/wingdi.h
@@ -2285,7 +2285,7 @@ typedef struct tagGCP_RESULTSW {
 	UINT *lpOrder;
 	INT *lpDx;
 	INT *lpCaretPos;
-	LPWSTR lpClass;
+	LPSTR lpClass;
 	LPWSTR lpGlyphs;
 	UINT nGlyphs;
 	UINT nMaxFit;