Skip to content

Commit a6072f7

Browse files
committed
uzlib: convert to submodule
Textualy, the files in lib/uzlib/src were identical to the ones committed in extmod/uzlib so there should be no behavioral change possible as a result of this commit.
1 parent d32349c commit a6072f7

File tree

10 files changed

+11
-992
lines changed

10 files changed

+11
-992
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
[submodule "lib/berkeley-db-1.xx"]
1212
path = lib/berkeley-db-1.xx
1313
url = https://github.com/pfalcon/berkeley-db-1.xx
14+
[submodule "lib/uzlib"]
15+
path = lib/uzlib
16+
url = https://github.com/pfalcon/uzlib
1417
[submodule "tools/uf2"]
1518
path = tools/uf2
1619
url = https://github.com/Microsoft/uf2.git

extmod/modubinascii.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ mp_obj_t mod_binascii_b2a_base64(mp_obj_t data) {
228228
MP_DEFINE_CONST_FUN_OBJ_1(mod_binascii_b2a_base64_obj, mod_binascii_b2a_base64);
229229

230230
#if MICROPY_PY_UBINASCII_CRC32
231-
#include "uzlib/tinf.h"
231+
#include "../../lib/uzlib/src/tinf.h"
232232

233233
mp_obj_t mod_binascii_crc32(size_t n_args, const mp_obj_t *args) {
234234
mp_buffer_info_t bufinfo;

extmod/moduzlib.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
#if MICROPY_PY_UZLIB
3535

36-
#include "uzlib/tinf.h"
36+
#include "../../lib/uzlib/src/tinf.h"
3737

3838
#if 0 // print debugging info
3939
#define DEBUG_printf DEBUG_printf
@@ -215,10 +215,10 @@ const mp_obj_module_t mp_module_uzlib = {
215215
// Source files #include'd here to make sure they're compiled in
216216
// only if module is enabled by config setting.
217217

218-
#include "uzlib/tinflate.c"
219-
#include "uzlib/tinfzlib.c"
220-
#include "uzlib/tinfgzip.c"
221-
#include "uzlib/adler32.c"
222-
#include "uzlib/crc32.c"
218+
#include "../../lib/uzlib/src/tinflate.c"
219+
#include "../../lib/uzlib/src/tinfzlib.c"
220+
#include "../../lib/uzlib/src/tinfgzip.c"
221+
#include "../../lib/uzlib/src/adler32.c"
222+
#include "../../lib/uzlib/src/crc32.c"
223223

224224
#endif // MICROPY_PY_UZLIB

extmod/uzlib/adler32.c

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

extmod/uzlib/crc32.c

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

extmod/uzlib/tinf.h

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

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy