Merge branch 'maint-0.3.1' into release-0.3.1
This commit is contained in:
commit
7ef22d0bf0
|
@ -0,0 +1,4 @@
|
||||||
|
o Minor bugfixes (compilation):
|
||||||
|
- Fix a compilation warning when building with zstd support
|
||||||
|
on 32-bit platforms. Fixes bug 23568; bugfix on 0.3.1.1-alpha.
|
||||||
|
Found and fixed by Andreas Stieger.
|
|
@ -62,10 +62,10 @@ tor_zstd_get_version_str(void)
|
||||||
|
|
||||||
version_number = ZSTD_versionNumber();
|
version_number = ZSTD_versionNumber();
|
||||||
tor_snprintf(version_str, sizeof(version_str),
|
tor_snprintf(version_str, sizeof(version_str),
|
||||||
"%lu.%lu.%lu",
|
"%d.%d.%d",
|
||||||
version_number / 10000 % 100,
|
(int) version_number / 10000 % 100,
|
||||||
version_number / 100 % 100,
|
(int) version_number / 100 % 100,
|
||||||
version_number % 100);
|
(int) version_number % 100);
|
||||||
|
|
||||||
return version_str;
|
return version_str;
|
||||||
#else
|
#else
|
||||||
|
|
Loading…
Reference in New Issue