aboutsummaryrefslogtreecommitdiff
path: root/py/mpconfig.h
diff options
context:
space:
mode:
authorDamien George2014-06-01 13:32:54 +0100
committerDamien George2014-06-01 13:32:54 +0100
commitfb510b3bf90eccc8e0d400c6622b2e94c2bfa8e9 (patch)
tree9160abef8ff03cba6ba2d1d5664f5fb706917355 /py/mpconfig.h
parentc60a261ef03f906ae1973f93c63169a5236f0b1f (diff)
Rename bultins config variables to MICROPY_PY_BUILTINS_*.
This renames: MICROPY_PY_FROZENSET -> MICROPY_PY_BUILTINS_FROZENSET MICROPY_PY_PROPERTY -> MICROPY_PY_BUILTINS_PROPERTY MICROPY_PY_SLICE -> MICROPY_PY_BUILTINS_SLICE MICROPY_ENABLE_FLOAT -> MICROPY_PY_BUILTINS_FLOAT See issue #35 for discussion.
Diffstat (limited to 'py/mpconfig.h')
-rw-r--r--py/mpconfig.h23
1 files changed, 11 insertions, 12 deletions
diff --git a/py/mpconfig.h b/py/mpconfig.h
index 1af27f767..a72d5c260 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -212,15 +212,15 @@ typedef long long mp_longint_impl_t;
#endif
#if MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_FLOAT
-#define MICROPY_ENABLE_FLOAT (1)
+#define MICROPY_PY_BUILTINS_FLOAT (1)
#define MICROPY_FLOAT_C_FUN(fun) fun##f
typedef float mp_float_t;
#elif MICROPY_FLOAT_IMPL == MICROPY_FLOAT_IMPL_DOUBLE
-#define MICROPY_ENABLE_FLOAT (1)
+#define MICROPY_PY_BUILTINS_FLOAT (1)
#define MICROPY_FLOAT_C_FUN(fun) fun
typedef double mp_float_t;
#else
-#define MICROPY_ENABLE_FLOAT (0)
+#define MICROPY_PY_BUILTINS_FLOAT (0)
#endif
// Enable features which improve CPython compatibility
@@ -239,20 +239,19 @@ typedef double mp_float_t;
/*****************************************************************************/
/* Fine control over Python builtins, classes, modules, etc */
-// Whether to support slice object and correspondingly
-// slice subscript operators
-#ifndef MICROPY_PY_SLICE
-#define MICROPY_PY_SLICE (1)
+// Whether to support slice subscript operators and slice object
+#ifndef MICROPY_PY_BUILTINS_SLICE
+#define MICROPY_PY_BUILTINS_SLICE (1)
#endif
// Whether to support frozenset object
-#ifndef MICROPY_PY_FROZENSET
-#define MICROPY_PY_FROZENSET (0)
+#ifndef MICROPY_PY_BUILTINS_FROZENSET
+#define MICROPY_PY_BUILTINS_FROZENSET (0)
#endif
-// Whether to support the property object
-#ifndef MICROPY_PY_PROPERTY
-#define MICROPY_PY_PROPERTY (1)
+// Whether to support property object
+#ifndef MICROPY_PY_BUILTINS_PROPERTY
+#define MICROPY_PY_BUILTINS_PROPERTY (1)
#endif
// Whether to provide "collections" module