Skip to content

Modify to work with Rust's bindgen #706

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 25, 2019
Merged

Modify to work with Rust's bindgen #706

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c3c48cf
Modify to work with Rust's bindgen
silverjam Jun 14, 2019
43fc48d
Merge remote-tracking branch 'origin/master' into silverjam/rustc-bin…
silverjam Jun 29, 2019
4947bce
Merge remote-tracking branch 'origin/master' into silverjam/rustc-bin…
Oct 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions c/include/libsbp/common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,11 @@
#ifndef LIBSBP_COMMON_H
#define LIBSBP_COMMON_H

#ifndef _RUSTC_BINDGEN_
#include <stdint.h>
#include <stdbool.h>
#include <inttypes.h>
#endif

/* Should match guard in libswiftnav/common.h */
#ifndef COMMON_INT_TYPES
Expand All @@ -28,6 +30,7 @@
* `int` which can lead to portability issues between different platforms.
* \{ */

#ifndef _RUSTC_BINDGEN_
Copy link
Contributor

@jbangelo jbangelo Oct 25, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does bindgen define it's own s8 etc types? Do we actually need to not include the stdlib headers?

Copy link
Contributor Author

@silverjam silverjam Oct 25, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I manually defined equivalent types to avoid the other includes that this generates. The lack of includes here is to limit the what bindgen tries to generate. Bindgen will attempt to generate bindings for everything it the .h-- so we want to avoid trying to generate bindings for everything in the c stdlib.

/** Signed 8-bit integer. */
typedef int8_t s8;
/** Signed 16-bit integer. */
Expand All @@ -44,6 +47,7 @@ typedef uint16_t u16;
typedef uint32_t u32;
/** Unsigned 64-bit integer. */
typedef uint64_t u64;
#endif

#endif

Expand Down