From 7b64f89f2c2aba64a88b8d33687659ee8034ce1c Mon Sep 17 00:00:00 2001 From: Alistair Smith Date: Fri, 9 May 2025 19:55:32 -0700 Subject: [PATCH] fix imports uws.zig --- src/deps/uws.zig | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/src/deps/uws.zig b/src/deps/uws.zig index f90bc56289..ddc5a5bd69 100644 --- a/src/deps/uws.zig +++ b/src/deps/uws.zig @@ -1,16 +1,6 @@ -const std = @import("std"); -pub const LIBUS_SOCKET_DESCRIPTOR = std.posix.socket_t; - const bun = @import("bun"); +const std = @import("std"); const Environment = bun.Environment; -const JSC = bun.JSC; -const BoringSSL = bun.BoringSSL.c; - -const SSLWrapper = @import("../bun.js/api/bun/ssl_wrapper.zig").SSLWrapper; -const EventLoopTimer = @import("../bun.js/api/Timer.zig").EventLoopTimer; -const TextEncoder = @import("../bun.js/webcore/encoding.zig").Encoder; -pub const Socket = @import("uws/socket.zig").Socket; - pub const LIBUS_LISTEN_DEFAULT: i32 = 0; pub const LIBUS_LISTEN_EXCLUSIVE_PORT: i32 = 1; pub const LIBUS_SOCKET_ALLOW_HALF_OPEN: i32 = 2; @@ -19,14 +9,21 @@ pub const LIBUS_SOCKET_IPV6_ONLY: i32 = 8; pub const LIBUS_LISTEN_REUSE_ADDR: i32 = 16; pub const LIBUS_LISTEN_DISALLOW_REUSE_PORT_FAILURE: i32 = 32; +pub const Socket = @import("uws/socket.zig").Socket; pub const ConnectingSocket = opaque {}; const debug = bun.Output.scoped(.uws, false); const uws = @This(); +const SSLWrapper = @import("../bun.js/api/bun/ssl_wrapper.zig").SSLWrapper; +const TextEncoder = @import("../bun.js/webcore/encoding.zig").Encoder; +const JSC = bun.JSC; +const EventLoopTimer = @import("../bun.js/api/Timer.zig").EventLoopTimer; const WriteResult = union(enum) { want_more: usize, backpressure: usize, }; +const BoringSSL = bun.BoringSSL.c; + fn NativeSocketHandleType(comptime ssl: bool) type { if (ssl) { return BoringSSL.SSL; @@ -4091,6 +4088,8 @@ pub const LIBUS_RECV_BUFFER_LENGTH = 524288; pub const LIBUS_TIMEOUT_GRANULARITY = @as(i32, 4); pub const LIBUS_RECV_BUFFER_PADDING = @as(i32, 32); pub const LIBUS_EXT_ALIGNMENT = @as(i32, 16); +pub const LIBUS_SOCKET_DESCRIPTOR = std.posix.socket_t; + pub const _COMPRESSOR_MASK: i32 = 255; pub const _DECOMPRESSOR_MASK: i32 = 3840; pub const DISABLED: i32 = 0;