d3c4106d6f6d587ec4b9013692dc1cf6da29c279 still doesn&#39;t fix the initial problem (see log below).<div><br></div><div>There is still another problem in shlobj.h caused by the inclusion on shobjidl.h from an extern C block:</div>

<div><br></div><div><a href="http://source.winehq.org/git/wine.git/?a=blob;f=include/shlobj.h;h=cda13060195f1c4104ee226f4132155a354d46de;hb=HEAD#l39">http://source.winehq.org/git/wine.git/?a=blob;f=include/shlobj.h;h=cda13060195f1c4104ee226f4132155a354d46de;hb=HEAD#l39</a></div>

<meta http-equiv="content-type" content="text/html; charset=utf-8"><div><div><br></div></div><div>Should I send a patch to move the three includes before extern C?</div><div><br></div><div>How to reproduce the problem:</div>

<meta http-equiv="content-type" content="text/html; charset=utf-8"><div><br></div><div><div>$ cat test.cpp </div><div>#include &lt;shlobj.h&gt;</div><div><br></div><div>$ wineg++ test.cpp </div><div>In file included from /usr/local/include/wine/windows/propsys.h:164,</div>

<div>                 from /usr/local/include/wine/windows/shobjidl.h:368,</div><div>                 from /usr/local/include/wine/windows/shlobj.h:39,</div><div>                 from test.cpp:1:</div><div>/usr/local/include/wine/windows/propkeydef.h: In function ‘bool operator==(const PROPERTYKEY&amp;, const PROPERTYKEY&amp;)’:</div>

<div>/usr/local/include/wine/windows/propkeydef.h:61: error: declaration of C function ‘bool operator==(const PROPERTYKEY&amp;, const PROPERTYKEY&amp;)’ conflicts with</div><div>/usr/local/include/wine/windows/guiddef.h:110: error: previous declaration ‘bool operator==(const GUID&amp;, const GUID&amp;)’ here</div>

<div>/usr/local/include/wine/windows/propkeydef.h: In function ‘bool operator!=(const PROPERTYKEY&amp;, const PROPERTYKEY&amp;)’:</div><div>/usr/local/include/wine/windows/propkeydef.h:65: error: declaration of C function ‘bool operator!=(const PROPERTYKEY&amp;, const PROPERTYKEY&amp;)’ conflicts with</div>

<div>/usr/local/include/wine/windows/guiddef.h:114: error: previous declaration ‘bool operator!=(const GUID&amp;, const GUID&amp;)’ here</div><div>winegcc: g++ failed</div></div><div><br></div>