diff options
| author | Shenghou Ma <minux.ma@gmail.com> | 2012-11-25 21:20:18 -0500 |
|---|---|---|
| committer | Russ Cox <rsc@swtch.com> | 2012-11-25 21:20:18 -0500 |
| commit | 7b9ef735a8d1fddf3887853abbd065271fa9c293 (patch) | |
| tree | 5bae2b05784702eeabe8f67a1396f0e73eb67f16 | |
| parent | 9ca6e21f3d0ea9b9bab8b4661d03d30ed61fd79d (diff) | |
| download | plan9port-7b9ef735a8d1fddf3887853abbd065271fa9c293.tar.gz plan9port-7b9ef735a8d1fddf3887853abbd065271fa9c293.tar.bz2 plan9port-7b9ef735a8d1fddf3887853abbd065271fa9c293.zip | |
devdraw: restore compilation on OS X 10.6
Also add some ignored files to .hgignore
R=rsc
http://codereview.appspot.com/6842089
| -rw-r--r-- | .hgignore | 7 | ||||
| -rw-r--r-- | CONTRIBUTORS | 1 | ||||
| -rw-r--r-- | src/cmd/devdraw/cocoa-screen.m | 2 |
3 files changed, 10 insertions, 0 deletions
@@ -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 index e1ea4fb5..72154085 100644 --- 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 index bceb7e3f..24baca1f 100644 --- 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(); } |