diff --git a/include/sys/types.h b/include/sys/types_internal.h similarity index 88% rename from include/sys/types.h rename to include/sys/types_internal.h index 19cf76bb78..5e533e810a 100644 --- a/include/sys/types.h +++ b/include/sys/types_internal.h @@ -1,5 +1,5 @@ -#ifndef _SYS_TYPES_H -#define _SYS_TYPES_H +#ifndef _SYS_TYPES_INTERNAL_H +#define _SYS_TYPES_INTERNAL_H #include typedef long blksize_t; @@ -31,5 +31,4 @@ typedef unsigned long u_long, ulong; typedef long long quad_t; typedef unsigned long long u_quad_t; typedef char *caddr_t; - -#endif /* _SYS_TYPES_H */ +#endif /* _SYS_TYPES_INTERNAL_H */ diff --git a/src/c/dlmalloc.c b/src/c/dlmalloc.c index 13db700317..8ae1f7a390 100644 --- a/src/c/dlmalloc.c +++ b/src/c/dlmalloc.c @@ -613,7 +613,7 @@ void *memset(void *s, int c, size_t n); #endif /* DARWIN */ #ifndef LACKS_SYS_TYPES_H -#include /* For size_t */ +#include /* For size_t */ #endif /* LACKS_SYS_TYPES_H */ /* The maximum possible size_t value has all bits set */ diff --git a/src/c/fcntl.c b/src/c/fcntl.c index 76b92022e1..23c48fa12a 100644 --- a/src/c/fcntl.c +++ b/src/c/fcntl.c @@ -1,5 +1,5 @@ #include -#include +#include // TODO: Can be implemented in rust when cbindgen supports "..." syntax diff --git a/src/header/mod.rs b/src/header/mod.rs index 81934256d8..eb2bbeab0d 100644 --- a/src/header/mod.rs +++ b/src/header/mod.rs @@ -51,6 +51,7 @@ pub mod arch_aarch64_user; pub mod arch_x64_user; pub mod sys_procfs; pub mod sys_random; +pub mod sys_types; pub mod sys_uio; pub mod sys_un; pub mod sys_utsname; diff --git a/src/header/sys_types/cbindgen.toml b/src/header/sys_types/cbindgen.toml new file mode 100644 index 0000000000..c8b7fca74b --- /dev/null +++ b/src/header/sys_types/cbindgen.toml @@ -0,0 +1,7 @@ +sys_includes = ["stddef.h", "sys/types_internal.h", "sys/select.h"] +include_guard = "_SYS_TYPES_H" +language = "C" +style = "Tag" + +[enum] +prefix_with_name = true \ No newline at end of file diff --git a/src/header/sys_types/mod.rs b/src/header/sys_types/mod.rs new file mode 100644 index 0000000000..c348094fca --- /dev/null +++ b/src/header/sys_types/mod.rs @@ -0,0 +1,2 @@ +//! sys/types.h +use crate::platform::types::*;