summaryrefslogtreecommitdiffstatshomepage
path: root/py/qstrdefs.h
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2014-04-19 02:18:19 +0100
committerDamien George <damien.p.george@gmail.com>2014-04-19 02:18:19 +0100
commit27dd471098e5d27949826295e821df972d9af083 (patch)
tree05566c9cb594250aafd845512305ba0bcb9cce96 /py/qstrdefs.h
parent3d19137442447f2e02db55bcd78b4c83cdc259f7 (diff)
parent206dd2a905fc4bca89c0b1a8beb2c71516f2053f (diff)
downloadmicropython-27dd471098e5d27949826295e821df972d9af083.tar.gz
micropython-27dd471098e5d27949826295e821df972d9af083.zip
Merge branch 'master' of github.com:micropython/micropython
Diffstat (limited to 'py/qstrdefs.h')
-rw-r--r--py/qstrdefs.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/py/qstrdefs.h b/py/qstrdefs.h
index a4df86fda7..86a5f2632c 100644
--- a/py/qstrdefs.h
+++ b/py/qstrdefs.h
@@ -139,16 +139,10 @@ Q(staticmethod)
Q(sum)
Q(super)
Q(str)
-#if MICROPY_ENABLE_MOD_STRUCT
-Q(struct)
-#endif
Q(sys)
Q(to_bytes)
Q(tuple)
Q(type)
-#if MICROPY_ENABLE_MOD_STRUCT
-Q(unpack)
-#endif
Q(value)
Q(zip)
@@ -299,6 +293,12 @@ Q(version)
Q(version_info)
#endif
+#if MICROPY_ENABLE_MOD_STRUCT
+Q(struct)
+Q(pack)
+Q(unpack)
+#endif
+
#if MICROPY_ENABLE_PROPERTY
Q(property)
Q(getter)