]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
CGMainDisplayID() doesn't exist on 10.1, so don't try to call it when
authorJack Jansen <jack.jansen@cwi.nl>
Wed, 2 Jun 2004 13:44:05 +0000 (13:44 +0000)
committerJack Jansen <jack.jansen@cwi.nl>
Wed, 2 Jun 2004 13:44:05 +0000 (13:44 +0000)
building for that platform.

Mac/Modules/macosmodule.c

index 271a5aa3d3910ff0b6f83084f7e437f0ceb55478..298aa0c6b4ecb852733d485f039fb71da82b08be 100644 (file)
@@ -439,9 +439,16 @@ MacOS_WMAvailable(PyObject *self, PyObject *args)
                ** It appears the function caches the result itself, and it's cheap, so
                ** no need for us to cache.
                */
+#ifdef kCGNullDirectDisplay
+               /* On 10.1 CGMainDisplayID() isn't available, and
+               ** kCGNullDirectDisplay isn't defined.
+               */
                if (CGMainDisplayID() == 0) {
                        rv = Py_False;
                } else {
+#else
+               {
+#endif
                        if (GetCurrentProcess(&psn) < 0 ||
                                SetFrontProcess(&psn) < 0) {
                                rv = Py_False;