Skip to content

Commit

Permalink
Merge #214
Browse files Browse the repository at this point in the history
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]>
  • Loading branch information
bors[bot] and mbrobbel authored Sep 3, 2021
2 parents 2024aee + cbbd6e4 commit 6ad95e7
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
3 changes: 3 additions & 0 deletions CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

## Unreleased

- Update types to fix build on ppc64le.
- <https://github.com/georust/gdal/pull/214/>

- Upgrade `semver` to 1.0 and trim gdal version output in `build.rs`.
- <https://github.com/georust/gdal/pull/211/>

Expand Down
2 changes: 1 addition & 1 deletion src/dataset.rs
Original file line number Diff line number Diff line change
Expand Up @@ -488,7 +488,7 @@ impl Dataset {
c_name.as_ptr(),
c_srs,
options.ty,
c_options_ptr as *mut *mut i8,
c_options_ptr as *mut *mut libc::c_char,
)
};
if c_layer.is_null() {
Expand Down
2 changes: 1 addition & 1 deletion src/driver.rs
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ impl Driver {
size_y as c_int,
bands as c_int,
T::gdal_type(),
options_c as *mut *mut i8,
options_c as gdal_sys::CSLConstList,
)
};
unsafe { gdal_sys::CSLDestroy(options_c) };
Expand Down

0 comments on commit 6ad95e7

Please sign in to comment.