devdraw: restore compilation on OS X 10.6

Also add some ignored files to .hgignore

R=rsc
http://codereview.appspot.com/6842089
This commit is contained in:
Shenghou Ma 2012-11-25 21:20:18 -05:00 committed by Russ Cox
parent 9ca6e21f3d
commit 7b9ef735a8
3 changed files with 10 additions and 0 deletions

View file

@ -18,3 +18,10 @@ y.tab.[ch]$
^dict/ ^dict/
^postscript/font/ ^postscript/font/
\.orig$ \.orig$
config
install.log
install.sum
last-change
lib/codereview/codereview.pyc
src/cmd/awk/y.output
src/cmd/devdraw/latin1.h

View file

@ -39,6 +39,7 @@ Rob Kroeger <robkroeger@gmail.com>
Rob Pike <robpike@gmail.com> Rob Pike <robpike@gmail.com>
Russ Cox <rsc@swtch.com> Russ Cox <rsc@swtch.com>
Sean McKean <smckean83@gmail.com> Sean McKean <smckean83@gmail.com>
Shenghou Ma <minux.ma@gmail.com>
Ties Bos <gitbisector@gmail.com> Ties Bos <gitbisector@gmail.com>
Tim Newsham <tim.newsham@gmail.com> Tim Newsham <tim.newsham@gmail.com>
Tony Lainson <t.lainson@gmail.com> Tony Lainson <t.lainson@gmail.com>

View file

@ -1408,9 +1408,11 @@ winsizepoints()
static NSSize static NSSize
winsizepixels() winsizepixels()
{ {
#if DOSX_VERSION >= 100700
if (OSX_VERSION >= 100700 && devdrawretina) if (OSX_VERSION >= 100700 && devdrawretina)
return [win.content convertSizeToBacking: winsizepoints()]; return [win.content convertSizeToBacking: winsizepoints()];
else else
#endif
return winsizepoints(); return winsizepoints();
} }