Skip to content

Commit 17149df

Browse files
committed
Rename Modules\zdict.c to zstddict.c
MSB8027: Two or more files with the name of zdict.c will produce outputs to the same location. This can lead to an incorrect build result. The files involved are ..\Modules\_zstd\zdict.c, \externals\zstd-1.5.7\lib\dictBuilder\zdict.c.
1 parent 755919f commit 17149df

File tree

5 files changed

+4
-4
lines changed

5 files changed

+4
-4
lines changed

Modules/Setup.stdlib.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
@MODULE_BINASCII_TRUE@binascii binascii.c
7070
@MODULE__BZ2_TRUE@_bz2 _bz2module.c
7171
@MODULE__LZMA_TRUE@_lzma _lzmamodule.c
72-
@MODULE__ZSTD_TRUE@_zstd _zstd/_zstdmodule.c _zstd/zdict.c _zstd/compressor.c _zstd/decompressor.c
72+
@MODULE__ZSTD_TRUE@_zstd _zstd/_zstdmodule.c _zstd/zstddict.c _zstd/compressor.c _zstd/decompressor.c
7373
@MODULE_ZLIB_TRUE@zlib zlibmodule.c
7474

7575
# dbm/gdbm
File renamed without changes.

Modules/_zstd/zdict.c renamed to Modules/_zstd/zstddict.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ _zstd_ZstdDict___init___impl(ZstdDict *self, PyObject *dict_content,
136136
}
137137

138138
#define clinic_state() (get_zstd_state(type))
139-
#include "clinic/zdict.c.h"
139+
#include "clinic/zstddict.c.h"
140140
#undef clinic_state
141141

142142
PyDoc_STRVAR(ZstdDict_dictid_doc,

PCbuild/_zstd.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
<ClCompile Include="..\Modules\_zstd\_zstdmodule.c" />
103103
<ClCompile Include="..\Modules\_zstd\compressor.c" />
104104
<ClCompile Include="..\Modules\_zstd\decompressor.c" />
105-
<ClCompile Include="..\Modules\_zstd\zdict.c" />
105+
<ClCompile Include="..\Modules\_zstd\zstddict.c" />
106106
<ClCompile Include="$(zstdDir)common\debug.c" />
107107
<ClCompile Include="$(zstdDir)common\entropy_common.c" />
108108
<ClCompile Include="$(zstdDir)common\error_private.c" />

PCbuild/_zstd.vcxproj.filters

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<ClCompile Include="..\Modules\_zstd\decompressor.c">
2828
<Filter>Source Files</Filter>
2929
</ClCompile>
30-
<ClCompile Include="..\Modules\_zstd\zdict.c">
30+
<ClCompile Include="..\Modules\_zstd\zstddict.c">
3131
<Filter>Source Files</Filter>
3232
</ClCompile>
3333
<ClCompile Include="$(zstdDir)common\debug.c">

0 commit comments

Comments
 (0)