summaryrefslogtreecommitdiff
path: root/py
diff options
context:
space:
mode:
authorPaul Sokolovsky <pfalcon@users.sourceforge.net>2016-06-16 01:40:31 +0300
committerPaul Sokolovsky <pfalcon@users.sourceforge.net>2016-06-16 01:42:48 +0300
commitf469c764428230363a2b22fedf303d86eea82853 (patch)
tree5e4544f9114a86f337919e4ad0f1cbfcf5895502 /py
parentb5190f1df35ff3cd3731a8cb0da5ab549a1d86e6 (diff)
py: Rename __QSTR_EXTRACT flag to NO_QSTR.
It has more usages than just qstr extraction, for example, embedding (where people don't care about efficient predefined qstrs).
Diffstat (limited to 'py')
-rw-r--r--py/mkrules.mk2
-rw-r--r--py/qstr.c2
-rw-r--r--py/qstr.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/py/mkrules.mk b/py/mkrules.mk
index b11a886f3..b77f8d600 100644
--- a/py/mkrules.mk
+++ b/py/mkrules.mk
@@ -49,7 +49,7 @@ $(BUILD)/%.o: %.c
# List all native flags since the current build system doesn't have
# the micropython configuration available. However, these flags are
# needed to extract all qstrings
-QSTR_GEN_EXTRA_CFLAGS += -D__QSTR_EXTRACT -DN_X64 -DN_X86 -DN_THUMB -DN_ARM
+QSTR_GEN_EXTRA_CFLAGS += -DNO_QSTR -DN_X64 -DN_X86 -DN_THUMB -DN_ARM
QSTR_GEN_EXTRA_CFLAGS += -I$(BUILD)/tmp
vpath %.c . $(TOP)
diff --git a/py/qstr.c b/py/qstr.c
index 24793ff8a..61202fb4a 100644
--- a/py/qstr.c
+++ b/py/qstr.c
@@ -93,7 +93,7 @@ const qstr_pool_t mp_qstr_const_pool = {
10, // set so that the first dynamically allocated pool is twice this size; must be <= the len (just below)
MP_QSTRnumber_of, // corresponds to number of strings in array just below
{
-#ifndef __QSTR_EXTRACT
+#ifndef NO_QSTR
#define QDEF(id, str) str,
#include "genhdr/qstrdefs.generated.h"
#undef QDEF
diff --git a/py/qstr.h b/py/qstr.h
index 1989ebe96..8c63fbbc8 100644
--- a/py/qstr.h
+++ b/py/qstr.h
@@ -37,7 +37,7 @@
// first entry in enum will be MP_QSTR_NULL=0, which indicates invalid/no qstr
enum {
-#ifndef __QSTR_EXTRACT
+#ifndef NO_QSTR
#define QDEF(id, str) id,
#include "genhdr/qstrdefs.generated.h"
#undef QDEF