Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(11)

Unified Diff: mojo/public/python/mojo/system_impl.pyx

Issue 795593004: Update mojo sdk to rev cc531b32182099a5a034a99daff35ed5d38a61c8 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: More workarounds for MSVC Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mojo/public/python/mojo/system.pyx ('k') | mojo/public/python/src/common.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/public/python/mojo/system_impl.pyx
diff --git a/mojo/public/python/mojo/system_impl.pyx b/mojo/public/python/mojo/system_impl.pyx
index 6e79c51b0e7421cca16adb508914afbc579aba51..3e299c1487180d389f8a8ba71c78ac69a375461d 100644
--- a/mojo/public/python/mojo/system_impl.pyx
+++ b/mojo/public/python/mojo/system_impl.pyx
@@ -4,18 +4,21 @@
# distutils language = c++
-cimport c_core
+cimport c_async_waiter
cimport c_environment
+cimport c_export # needed so the init function gets exported
+cimport c_thunks
from libc.stdint cimport uintptr_t
+
def SetSystemThunks(system_thunks_as_object):
"""Bind the basic Mojo Core functions.
"""
- cdef const c_core.MojoSystemThunks* system_thunks = (
- <const c_core.MojoSystemThunks*><uintptr_t>system_thunks_as_object)
- c_core.MojoSetSystemThunks(system_thunks)
+ cdef const c_thunks.MojoSystemThunks* system_thunks = (
+ <const c_thunks.MojoSystemThunks*><uintptr_t>system_thunks_as_object)
+ c_thunks.MojoSetSystemThunks(system_thunks)
cdef class RunLoop(object):
@@ -53,13 +56,13 @@ cdef class RunLoop(object):
# We use a wrapping class to be able to call the C++ class PythonAsyncWaiter
# across module boundaries.
-cdef class _AsyncWaiter(object):
+cdef class AsyncWaiter(object):
cdef c_environment.CEnvironment* _cenvironment
- cdef c_environment.PythonAsyncWaiter* _c_async_waiter
+ cdef c_async_waiter.PythonAsyncWaiter* _c_async_waiter
def __init__(self):
self._cenvironment = new c_environment.CEnvironment()
- self._c_async_waiter = new c_environment.PythonAsyncWaiter()
+ self._c_async_waiter = c_environment.NewAsyncWaiter()
def __dealloc__(self):
del self._c_async_waiter
@@ -70,6 +73,3 @@ cdef class _AsyncWaiter(object):
def CancelWait(self, wait_id):
self._c_async_waiter.CancelWait(wait_id)
-
-
-ASYNC_WAITER = _AsyncWaiter()
« no previous file with comments | « mojo/public/python/mojo/system.pyx ('k') | mojo/public/python/src/common.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698