Created attachment 59345 [details]
Should fix the Windows build, at least in a clean client.
Comment on attachment 59345 [details]
Looks sane to me.
Landed as r61603.
If you see anything wrong with this patch, please let me know and I'll be happy to fix the problem.
The patch looks fine. Thanks for fixing it!
I wish we knew why this error started happening in the first place, though.
(In reply to comment #4)
> I wish we knew why this error started happening in the first place, though.
Looks like the culprit is <http://trac.webkit.org/changeset/61576>, which must have caused FastMalloc.h to get pulled into ImageDiff.
Another option would have been to define USE_SYSTEM_MALLOC=1.