Skip to content

Commit 1df6a11

Browse files
committed
libc: move imaxabs to inttypes.zig and don't use cInclude
1 parent 02ab611 commit 1df6a11

File tree

4 files changed

+15
-9
lines changed

4 files changed

+15
-9
lines changed

lib/c.zig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ else
1616
comptime {
1717
if (builtin.target.isMuslLibC() or builtin.target.isWasiLibC()) {
1818
// Files specific to musl and wasi-libc.
19+
_ = @import("c/inttypes.zig");
1920
_ = @import("c/stdlib.zig");
2021
_ = @import("c/string.zig");
2122
_ = @import("c/strings.zig");

lib/c/inttypes.zig

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
const std = @import("std");
2+
const common = @import("common.zig");
3+
const intmax_t = std.c.intmax_t;
4+
5+
comptime {
6+
@export(&imaxabs, .{ .name = "imaxabs", .linkage = common.linkage, .visibility = common.visibility });
7+
}
8+
9+
fn imaxabs(a: intmax_t) callconv(.c) intmax_t {
10+
return if (a > 0) a else -a;
11+
}

lib/c/stdlib.zig

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,8 @@
11
const std = @import("std");
22
const common = @import("common.zig");
3-
const c = @cImport({
4-
@cInclude("stdint.h");
5-
});
6-
const c_intmax_t = c.intmax_t;
73

84
comptime {
95
@export(&abs, .{ .name = "abs", .linkage = common.linkage, .visibility = common.visibility });
10-
@export(&imaxabs, .{ .name = "imaxabs", .linkage = common.linkage, .visibility = common.visibility });
116
@export(&labs, .{ .name = "labs", .linkage = common.linkage, .visibility = common.visibility });
127
@export(&llabs, .{ .name = "llabs", .linkage = common.linkage, .visibility = common.visibility });
138
}
@@ -16,10 +11,6 @@ fn abs(a: c_int) callconv(.c) c_int {
1611
return if (a > 0) a else -a;
1712
}
1813

19-
fn imaxabs(a: c_intmax_t) callconv(.c) c_intmax_t {
20-
return if (a > 0) a else -a;
21-
}
22-
2314
fn labs(a: c_long) callconv(.c) c_long {
2415
return if (a > 0) a else -a;
2516
}

lib/std/c.zig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10796,6 +10796,9 @@ else
1079610796
b: c_longdouble,
1079710797
};
1079810798

10799+
pub const intmax_t = i64;
10800+
pub const uintmax_t = u64;
10801+
1079910802
pub extern "c" fn pthread_getthreadid_np() c_int;
1080010803
pub extern "c" fn pthread_set_name_np(thread: pthread_t, name: [*:0]const u8) void;
1080110804
pub extern "c" fn pthread_get_name_np(thread: pthread_t, name: [*:0]u8, len: usize) void;

0 commit comments

Comments
 (0)