commit 7b9ef735a8d1fddf3887853abbd065271fa9c293 from: Shenghou Ma via: Russ Cox date: Mon Nov 26 02:20:18 2012 UTC devdraw: restore compilation on OS X 10.6 Also add some ignored files to .hgignore R=rsc http://codereview.appspot.com/6842089 commit - 9ca6e21f3d0ea9b9bab8b4661d03d30ed61fd79d commit + 7b9ef735a8d1fddf3887853abbd065271fa9c293 blob - 8a71772bb1c614b19d07479a69302484ef078850 blob + ae8348cb063807aa54bd548cb0d0fca02c7ee8f2 --- .hgignore +++ .hgignore @@ -18,3 +18,10 @@ y.tab.[ch]$ ^dict/ ^postscript/font/ \.orig$ +config +install.log +install.sum +last-change +lib/codereview/codereview.pyc +src/cmd/awk/y.output +src/cmd/devdraw/latin1.h blob - e1ea4fb5ad53f9e61001a01190f858aa7e9d9806 blob + 7215408544439f1711ce1a60c68f0f791dc7a7af --- CONTRIBUTORS +++ CONTRIBUTORS @@ -39,6 +39,7 @@ Rob Kroeger Rob Pike Russ Cox Sean McKean +Shenghou Ma Ties Bos Tim Newsham Tony Lainson blob - bceb7e3f9b1029658ea699810ed13439d17a4683 blob + 24baca1ffb0aa567d5c000c8a38048cd131975d0 --- src/cmd/devdraw/cocoa-screen.m +++ src/cmd/devdraw/cocoa-screen.m @@ -1408,9 +1408,11 @@ winsizepoints() static NSSize winsizepixels() { +#if DOSX_VERSION >= 100700 if (OSX_VERSION >= 100700 && devdrawretina) return [win.content convertSizeToBacking: winsizepoints()]; else +#endif return winsizepoints(); }