Skip to content

Commit 27dd910

Browse files
dpgeorgedpgeorge
committed
Merge branch 'stinos-msvc-extmod'
2 parents bad2df3 + e875e38 commit 27dd910

4 files changed

Lines changed: 7 additions & 4 deletions

File tree

‎extmod/moductypes.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -261,10 +261,10 @@ STATIC inline mp_obj_t get_unaligned(uint val_type, void *p, int big_endian) {
261261
}
262262
}
263263

264-
STATIC inline void set_unaligned(uint val_type, void *p, int big_endian, mp_obj_t val) {
264+
STATIC inline void set_unaligned(uint val_type, byte *p, int big_endian, mp_obj_t val) {
265265
char struct_type = big_endian ? '>' : '<';
266266
static const char type2char[8] = "BbHhIiQq";
267-
mp_binary_set_val(struct_type, type2char[val_type], val, (byte**)&p);
267+
mp_binary_set_val(struct_type, type2char[val_type], val, &p);
268268
}
269269

270270
static inline mp_uint_t get_aligned_basic(uint val_type, void *p) {

‎extmod/modzlibd.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ STATIC mp_obj_t mod_zlibd_decompress(uint n_args, mp_obj_t *args) {
6464
size_t in_buf_sz = bufinfo.len - in_buf_ofs;
6565
DEBUG_printf("tinfl in: in_ofs=%d in_sz=%d dst_ofs=%d, dst_sz=%d\n", in_buf_ofs, in_buf_sz, dst_buf_ofs, dst_buf_sz);
6666
tinfl_status st = tinfl_decompress(decomp,
67-
bufinfo.buf + in_buf_ofs, &in_buf_sz,
67+
(mz_uint8*) bufinfo.buf + in_buf_ofs, &in_buf_sz,
6868
out, out + dst_buf_ofs, &dst_buf_sz,
6969
TINFL_FLAG_USING_NON_WRAPPING_OUTPUT_BUF | TINFL_FLAG_PARSE_ZLIB_HEADER);
7070
DEBUG_printf("tinfl out: st=%d, in_sz=%d, out_sz=%d\n", st, in_buf_sz, dst_buf_sz);

‎windows/mpconfigport.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,8 @@
5454
#define MICROPY_PY_CMATH (1)
5555
#define MICROPY_PY_IO_FILEIO (1)
5656
#define MICROPY_PY_GC_COLLECT_RETVAL (1)
57+
#define MICROPY_PY_UCTYPES (1)
58+
#define MICROPY_PY_ZLIBD (1)
5759
#define MICROPY_ERROR_REPORTING (MICROPY_ERROR_REPORTING_DETAILED)
5860
#ifdef _MSC_VER
5961
#define MICROPY_GCREGS_SETJMP (1)

‎windows/msvc/sources.props‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@
55
</PropertyGroup>
66
<ItemGroup>
77
<ClCompile Include="$(PyBaseDir)py\*.c" />
8-
<ClCompile Include="$(PyBaseDir)unix\*.c" Exclude="$(PyBaseDir)unix\modffi.c;$(PyBaseDir)unix\modsocket.c;$(PyBaseDir)unix\seg_helpers.c" />
8+
<ClCompile Include="$(PyBaseDir)extmod\*.c" />
9+
<ClCompile Include="$(PyBaseDir)unix\*.c" Exclude="$(PyBaseDir)unix\modffi.c;$(PyBaseDir)unix\modsocket.c;$(PyBaseDir)unix\modtermios.c;$(PyBaseDir)unix\seg_helpers.c" />
910
<ClCompile Include="$(PyBaseDir)windows\*.c" />
1011
<ClCompile Include="$(PyBaseDir)windows\msvc\*.c" />
1112
</ItemGroup>

0 commit comments

Comments
 (0)