Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitd27c0bb

Browse files
committed
Merge pull requestadafruit#905 from pfalcon/remove-zlibd
Remove zlibd, superceded by uzlib
2 parents4b71c05 +911c00b commitd27c0bb

File tree

8 files changed

+1
-718
lines changed

8 files changed

+1
-718
lines changed

‎extmod/miniz/tinfl.c‎

Lines changed: 0 additions & 595 deletions
This file was deleted.

‎extmod/modzlibd.c‎

Lines changed: 0 additions & 108 deletions
This file was deleted.

‎py/builtin.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ extern struct _dummy_t mp_sys_stderr_obj;
8888

8989
// extmod modules
9090
externconstmp_obj_module_tmp_module_uctypes;
91-
externconstmp_obj_module_tmp_module_zlibd;
9291
externconstmp_obj_module_tmp_module_uzlib;
9392
externconstmp_obj_module_tmp_module_ujson;
9493
externconstmp_obj_module_tmp_module_ure;

‎py/builtintables.c‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -203,9 +203,6 @@ STATIC const mp_map_elem_t mp_builtin_module_table[] = {
203203
#ifMICROPY_PY_UCTYPES
204204
{MP_OBJ_NEW_QSTR(MP_QSTR_uctypes), (mp_obj_t)&mp_module_uctypes },
205205
#endif
206-
#ifMICROPY_PY_ZLIBD
207-
{MP_OBJ_NEW_QSTR(MP_QSTR_zlibd), (mp_obj_t)&mp_module_zlibd },
208-
#endif
209206
#ifMICROPY_PY_UZLIB
210207
{MP_OBJ_NEW_QSTR(MP_QSTR_uzlib), (mp_obj_t)&mp_module_uzlib },
211208
#endif

‎py/mpconfig.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -391,10 +391,6 @@ typedef double mp_float_t;
391391
#defineMICROPY_PY_UCTYPES (0)
392392
#endif
393393

394-
#ifndefMICROPY_PY_ZLIBD
395-
#defineMICROPY_PY_ZLIBD (0)
396-
#endif
397-
398394
#ifndefMICROPY_PY_UZLIB
399395
#defineMICROPY_PY_UZLIB (0)
400396
#endif

‎py/py.mk‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@ PY_O_BASENAME = \
111111
pfenv.o\
112112
pfenv_printf.o\
113113
../extmod/moductypes.o\
114-
../extmod/modzlibd.o\
115114
../extmod/modujson.o\
116115
../extmod/modure.o\
117116
../extmod/moduzlib.o\

‎py/qstrdefs.h‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -463,11 +463,6 @@ Q(setter)
463463
Q(deleter)
464464
#endif
465465

466-
#ifMICROPY_PY_ZLIBD
467-
Q(zlibd)
468-
Q(decompress)
469-
#endif
470-
471466
#ifMICROPY_PY_UZLIB
472467
Q(uzlib)
473468
Q(decompress)

‎windows/mpconfigport.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
#defineMICROPY_PY_GC_COLLECT_RETVAL (1)
5858

5959
#defineMICROPY_PY_UCTYPES (1)
60-
#defineMICROPY_PY_ZLIBD (1)
60+
#defineMICROPY_PY_UZLIB (1)
6161
#defineMICROPY_PY_UJSON (1)
6262

6363
#defineMICROPY_ERROR_REPORTING (MICROPY_ERROR_REPORTING_DETAILED)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp