diff options
| author | Damien George <damien.p.george@gmail.com> | 2014-10-13 18:04:16 +0100 |
|---|---|---|
| committer | Damien George <damien.p.george@gmail.com> | 2014-10-13 18:04:16 +0100 |
| commit | d27c0bb3aa3e571a9efc43fa54c16b85e91a7b03 (patch) | |
| tree | 0902a1ce21e5eedbc8eead815a33d1193ea8d025 /py | |
| parent | 4b71c056efef42d8bb81b980e0fd53ec0597249d (diff) | |
| parent | 911c00bbc5d4197b0f0aac8a1b656098222ac455 (diff) | |
| download | micropython-d27c0bb3aa3e571a9efc43fa54c16b85e91a7b03.tar.gz micropython-d27c0bb3aa3e571a9efc43fa54c16b85e91a7b03.zip | |
Merge pull request #905 from pfalcon/remove-zlibd
Remove zlibd, superceded by uzlib
Diffstat (limited to 'py')
| -rw-r--r-- | py/builtin.h | 1 | ||||
| -rw-r--r-- | py/builtintables.c | 3 | ||||
| -rw-r--r-- | py/mpconfig.h | 4 | ||||
| -rw-r--r-- | py/py.mk | 1 | ||||
| -rw-r--r-- | py/qstrdefs.h | 5 |
5 files changed, 0 insertions, 14 deletions
diff --git a/py/builtin.h b/py/builtin.h index 5a68609aee..01ec22d2b0 100644 --- a/py/builtin.h +++ b/py/builtin.h @@ -88,7 +88,6 @@ extern struct _dummy_t mp_sys_stderr_obj; // extmod modules extern const mp_obj_module_t mp_module_uctypes; -extern const mp_obj_module_t mp_module_zlibd; extern const mp_obj_module_t mp_module_uzlib; extern const mp_obj_module_t mp_module_ujson; extern const mp_obj_module_t mp_module_ure; diff --git a/py/builtintables.c b/py/builtintables.c index 972aee9c18..b67ef05169 100644 --- a/py/builtintables.c +++ b/py/builtintables.c @@ -203,9 +203,6 @@ STATIC const mp_map_elem_t mp_builtin_module_table[] = { #if MICROPY_PY_UCTYPES { MP_OBJ_NEW_QSTR(MP_QSTR_uctypes), (mp_obj_t)&mp_module_uctypes }, #endif -#if MICROPY_PY_ZLIBD - { MP_OBJ_NEW_QSTR(MP_QSTR_zlibd), (mp_obj_t)&mp_module_zlibd }, -#endif #if MICROPY_PY_UZLIB { MP_OBJ_NEW_QSTR(MP_QSTR_uzlib), (mp_obj_t)&mp_module_uzlib }, #endif diff --git a/py/mpconfig.h b/py/mpconfig.h index 96108a6117..618b8fde5f 100644 --- a/py/mpconfig.h +++ b/py/mpconfig.h @@ -391,10 +391,6 @@ typedef double mp_float_t; #define MICROPY_PY_UCTYPES (0) #endif -#ifndef MICROPY_PY_ZLIBD -#define MICROPY_PY_ZLIBD (0) -#endif - #ifndef MICROPY_PY_UZLIB #define MICROPY_PY_UZLIB (0) #endif @@ -111,7 +111,6 @@ PY_O_BASENAME = \ pfenv.o \ pfenv_printf.o \ ../extmod/moductypes.o \ - ../extmod/modzlibd.o \ ../extmod/modujson.o \ ../extmod/modure.o \ ../extmod/moduzlib.o \ diff --git a/py/qstrdefs.h b/py/qstrdefs.h index a67cd92b83..3252e35ad4 100644 --- a/py/qstrdefs.h +++ b/py/qstrdefs.h @@ -463,11 +463,6 @@ Q(setter) Q(deleter) #endif -#if MICROPY_PY_ZLIBD -Q(zlibd) -Q(decompress) -#endif - #if MICROPY_PY_UZLIB Q(uzlib) Q(decompress) |