Skip to content

Commit 6ad95e7

Browse files
bors[bot]mbrobbel
andauthored
Merge #214
214: Update types to fix build on ppc64le r=lnicola a=mbrobbel - [x] I agree to follow the project's [code of conduct](https://github.com/georust/gdal/blob/master/CODE_OF_CONDUCT.md). - [x] I added an entry to `CHANGES.md` if knowledge of this change could be valuable to users. --- `libc::c_char` is a `u8` on `ppc64le`. Using the type definition from `libc` fixes it (maybe for other archs too). Co-authored-by: Matthijs Brobbel <[email protected]>
2 parents 2024aee + cbbd6e4 commit 6ad95e7

File tree

3 files changed

+5
-2
lines changed

3 files changed

+5
-2
lines changed

CHANGES.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
## Unreleased
44

5+
- Update types to fix build on ppc64le.
6+
- <https://github.com/georust/gdal/pull/214/>
7+
58
- Upgrade `semver` to 1.0 and trim gdal version output in `build.rs`.
69
- <https://github.com/georust/gdal/pull/211/>
710

src/dataset.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@ impl Dataset {
488488
c_name.as_ptr(),
489489
c_srs,
490490
options.ty,
491-
c_options_ptr as *mut *mut i8,
491+
c_options_ptr as *mut *mut libc::c_char,
492492
)
493493
};
494494
if c_layer.is_null() {

src/driver.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ impl Driver {
120120
size_y as c_int,
121121
bands as c_int,
122122
T::gdal_type(),
123-
options_c as *mut *mut i8,
123+
options_c as gdal_sys::CSLConstList,
124124
)
125125
};
126126
unsafe { gdal_sys::CSLDestroy(options_c) };

0 commit comments

Comments
 (0)