diff options
| author | John R. Lenton <jlenton@gmail.com> | 2014-01-05 22:27:11 +0000 |
|---|---|---|
| committer | John R. Lenton <jlenton@gmail.com> | 2014-01-05 22:27:11 +0000 |
| commit | d52a0318ce266e1d9ce0d877f64a8fe097cef080 (patch) | |
| tree | 9c57f2bd169754c56679b25dd41c003a046c1137 /py/emitnative.c | |
| parent | 49fb6e53b35f991d79caadbb6320a39452944b4d (diff) | |
| parent | 12e2656472bf53e467c066eda6f3e177a97210ca (diff) | |
| download | micropython-d52a0318ce266e1d9ce0d877f64a8fe097cef080.tar.gz micropython-d52a0318ce266e1d9ce0d877f64a8fe097cef080.zip | |
Merge remote-tracking branch 'upstream/master' into list_remove
Diffstat (limited to 'py/emitnative.c')
| -rw-r--r-- | py/emitnative.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/py/emitnative.c b/py/emitnative.c index a29922d96c..cc00c57319 100644 --- a/py/emitnative.c +++ b/py/emitnative.c @@ -34,7 +34,7 @@ #include "runtime.h" // wrapper around everything in this file -#if N_X64 || N_THUMB +#if (MICROPY_EMIT_X64 && N_X64) || (MICROPY_EMIT_THUMB && N_THUMB) #if N_X64 @@ -1319,4 +1319,4 @@ const emit_method_table_t EXPORT_FUN(method_table) = { emit_native_yield_from, }; -#endif // N_X64 || N_THUMB +#endif // (MICROPY_EMIT_X64 && N_X64) || (MICROPY_EMIT_THUMB && N_THUMB) |