diff options
| author | John R. Lenton | 2014-01-04 14:16:24 +0000 |
|---|---|---|
| committer | John R. Lenton | 2014-01-04 14:16:24 +0000 |
| commit | 505dd00f07f984abed50024df6f88820cceba7db (patch) | |
| tree | 4ef614d9811df3cdb814257d12a0b3b247a35de9 /py/emitnative.c | |
| parent | ff9a24f6f7c576e129685ce59cd9e0a87925cef8 (diff) | |
| parent | e67ed5d285bb2ae7b83eb8be3ee488ab08fa4db1 (diff) | |
Merge remote-tracking branch 'upstream/master' into list_count
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 a29922d96..cc00c5731 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) |