Merge pull request adafruit#905 from pfalcon/remove-zlibd

dpgeorge · dpgeorge · commit d27c0bb3aa3e · 2014-10-13T18:04:16.000+01:00
Remove zlibd, superceded by uzlib
diff --git a/extmod/miniz/tinfl.c b/extmod/miniz/tinfl.c
diff --git a/extmod/modzlibd.c b/extmod/modzlibd.c
diff --git 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
@@ -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
@@ -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
diff --git a/py/py.mk b/py/py.mk
@@ -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
@@ -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)
diff --git a/windows/mpconfigport.h b/windows/mpconfigport.h
@@ -57,7 +57,7 @@
 #define MICROPY_PY_GC_COLLECT_RETVAL (1)
 
 #define MICROPY_PY_UCTYPES          (1)
-#define MICROPY_PY_ZLIBD            (1)
+#define MICROPY_PY_UZLIB            (1)
 #define MICROPY_PY_UJSON            (1)
 
 #define MICROPY_ERROR_REPORTING     (MICROPY_ERROR_REPORTING_DETAILED)
