Skip to content

Commit e790898

Browse files
authored
Merge pull request #37 from JuliaIO/vs/bump-zstd
Update Zstd to 1.5.5
2 parents f7e431a + d8d1cbd commit e790898

File tree

11 files changed

+143
-218
lines changed

11 files changed

+143
-218
lines changed

Project.toml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,15 @@ uuid = "6b39b394-51ab-5f42-8807-6242bab2b4c2"
33
license = "MIT"
44
authors = ["Kenta Sato <[email protected]>",
55
"JuliaIO Github Organization"]
6-
version = "0.7.2"
6+
version = "0.8.0"
77

88
[deps]
9-
CEnum = "fa961155-64e5-5f13-b03f-caf6b980ea82"
109
TranscodingStreams = "3bb67fe8-82b1-5028-8e26-92a6c54297fa"
1110
Zstd_jll = "3161d3a3-bdf6-5164-811a-617609db77b4"
1211

1312
[compat]
1413
TranscodingStreams = "0.9"
15-
Zstd_jll = "1.4"
16-
CEnum = "0.4"
14+
Zstd_jll = "1.5.5"
1715
julia = "1.3"
1816

1917
[extras]

gen/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Manifest.toml

src/libzstd/Project.toml renamed to gen/Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ Clang = "40e3b903-d033-50b4-a0cc-940c62c95e31"
33
Zstd_jll = "3161d3a3-bdf6-5164-811a-617609db77b4"
44

55
[compat]
6-
Clang = "0.14"
6+
Clang = "0.17"
File renamed without changes.

gen/generator.toml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
[general]
2+
library_name = "libzstd"
3+
output_file_path = "../src/LibZstd_clang.jl"
4+
module_name = "LibZstd"
5+
jll_pkg_name = "Zstd_jll"
6+
export_symbol_prefixes = ["ZSTD_", "ZDICT_"]
7+
prologue_file_path = "./prologue.jl"
8+
use_julia_native_enum_type = true
9+
print_using_CEnum = false

gen/prologue.jl

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
const INT_MAX = typemax(Cint)
2+
const size_t = Int64
3+
4+
ZSTD_EXPAND_AND_QUOTE(expr) = string(expr)

src/CodecZstd.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import TranscodingStreams:
1818
using Zstd_jll
1919

2020
# Module containing directly wrapped ccalls generated by CLang.jl
21-
include("libzstd/LibZstd.jl")
21+
include("LibZstd_clang.jl")
2222
# Library functions that have a Julian interface. This file originally preceded the above module
2323
include("libzstd.jl")
2424
include("compression.jl")

0 commit comments

Comments
 (0)