commit 7b9ef735a8d1fddf3887853abbd065271fa9c293
parent 9ca6e21f3d0ea9b9bab8b4661d03d30ed61fd79d
Author: Shenghou Ma <minux.ma@gmail.com>
Date: Sun, 25 Nov 2012 21:20:18 -0500
devdraw: restore compilation on OS X 10.6
Also add some ignored files to .hgignore
R=rsc
http://codereview.appspot.com/6842089
Diffstat:
3 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/.hgignore b/.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
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
@@ -39,6 +39,7 @@ Rob Kroeger <robkroeger@gmail.com>
Rob Pike <robpike@gmail.com>
Russ Cox <rsc@swtch.com>
Sean McKean <smckean83@gmail.com>
+Shenghou Ma <minux.ma@gmail.com>
Ties Bos <gitbisector@gmail.com>
Tim Newsham <tim.newsham@gmail.com>
Tony Lainson <t.lainson@gmail.com>
diff --git a/src/cmd/devdraw/cocoa-screen.m b/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();
}