diff --git a/.gitignore b/.gitignore index 579000fd..ad9ae7b4 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,3 @@ zig-out /vendor/libiconv/ lightpanda.id /v8/ -/vendor/nghttp2/lib/includes/nghttp2/nghttp2ver.h diff --git a/build.zig b/build.zig index e3c025d9..4921c6f3 100644 --- a/build.zig +++ b/build.zig @@ -150,6 +150,8 @@ fn common(b: *Build, opts: *Build.Step.Options, step: *Build.Step.Compile) !void mod.addImport("build_config", opts.createModule()); mod.addImport("tigerbeetle-io", b.dependency("tigerbeetle_io", .{}).module("tigerbeetle_io")); + mod.addIncludePath(b.path("vendor/lightpanda")); + { // v8 mod.link_libcpp = true; @@ -606,16 +608,6 @@ fn buildNghttp2(b: *Build, m: *Build.Module) !void { .root_module = m, }); - const nghttp2_version_file = b.addWriteFile( - "vendor/nghttp2/lib/includes/nghttp2/nghttp2ver.h", - \\ #ifndef NGHTTP2VER_H - \\ #define NGHTTP2VER_H - \\ #define NGHTTP2_VERSION "1.66" - \\ #define NGHTTP2_VERSION_NUM 0x014300 - \\ #endif /* NGHTTP2VER_H */ - ); - nghttp2.step.dependOn(&nghttp2_version_file.step); - const root = "vendor/nghttp2/"; nghttp2.addIncludePath(b.path(root ++ "lib")); nghttp2.addIncludePath(b.path(root ++ "lib/includes")); diff --git a/src/notification.zig b/src/notification.zig index 56059e1a..7caed088 100644 --- a/src/notification.zig +++ b/src/notification.zig @@ -2,8 +2,8 @@ const std = @import("std"); const log = @import("log.zig"); const URL = @import("url.zig").URL; -const http = @import("http/client.zig"); const page = @import("browser/page.zig"); +const Http = @import("http/Http.zig"); const Allocator = std.mem.Allocator; @@ -94,7 +94,7 @@ pub const Notification = struct { arena: Allocator, id: usize, url: *const std.Uri, - method: http.Method, + method: Http.Method, has_body: bool, }; diff --git a/vendor/lightpanda/nghttp2/nghttp2ver.h b/vendor/lightpanda/nghttp2/nghttp2ver.h new file mode 100644 index 00000000..3dbb2ea8 --- /dev/null +++ b/vendor/lightpanda/nghttp2/nghttp2ver.h @@ -0,0 +1,5 @@ +#ifndef NGHTTP2VER_H +#define NGHTTP2VER_H +#define NGHTTP2_VERSION "1.66" +#define NGHTTP2_VERSION_NUM 0x014300 +#endif /* NGHTTP2VER_H */