diff options
| author |  Jarred Sumner <jarred@jarredsumner.com>
| 2023-08-28 08:38:30 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2023-08-28 08:38:30 -0700 |
| commit | a2ddfe6913c1884bfef6314d00cf2b708281ff79 (patch) | |
| tree | 88e436313a73d2ab1426ac94be122d62fecb72bc /src | |
| parent | 6e4a1f2918cb4dbcc035d350d6cd9f018ea8df59 (diff) | |
| download | bun-a2ddfe6913c1884bfef6314d00cf2b708281ff79.tar.gz bun-a2ddfe6913c1884bfef6314d00cf2b708281ff79.tar.zst bun-a2ddfe6913c1884bfef6314d00cf2b708281ff79.zip | |
Bring uSockets & uWebSockets forks into Bun's repository (#4372)
* Move uWebSockets and uSockets forks into Bun's repository
* Update Makefile
* Update settings.json
* Update libuwsockets.cpp
* Remove backends we won't be using
* Update bindings.cpp
---------
Co-authored-by: Jarred Sumner <709451+Jarred-Sumner@users.noreply.github.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/bun.js/bindings/BunInspector.cpp | 9 | ||||
| -rw-r--r-- | src/bun.js/bindings/bindings.cpp | 4 | ||||
| -rw-r--r-- | src/deps/libuwsockets.cpp | 6 | ||||
| m--------- | src/deps/uws | 0 |
4 files changed, 9 insertions, 10 deletions
diff --git a/src/bun.js/bindings/BunInspector.cpp b/src/bun.js/bindings/BunInspector.cpp index 76920e398..a222e7b63 100644 --- a/src/bun.js/bindings/BunInspector.cpp +++ b/src/bun.js/bindings/BunInspector.cpp @@ -1,5 +1,5 @@ #include "root.h" -#include <uws/src/App.h> +#include <bun-uws/src/App.h> #include <JavaScriptCore/InspectorFrontendChannel.h> #include <JavaScriptCore/JSGlobalObjectDebuggable.h> @@ -36,12 +36,12 @@ public: this->globalObject = globalObject; this->globalObject->inspectorDebuggable().connect(*this); - Inspector::JSGlobalObjectDebugger* debugger = reinterpret_cast<Inspector::JSGlobalObjectDebugger*>(this->globalObject->debugger()); - if (debugger) { + Inspector::JSGlobalObjectDebugger* debugger = reinterpret_cast<Inspector::JSGlobalObjectDebugger*>(this->globalObject->debugger()); + if (debugger) { debugger->runWhilePausedCallback = [](JSC::JSGlobalObject& globalObject, bool& isPaused) -> void { Bun__tickWhilePaused(&isPaused); }; - } + } } void onClose() @@ -102,7 +102,6 @@ public: using BunInspectorConnectionNoSSL = BunInspectorConnection<false>; using SSLBunInspectorConnection = BunInspectorConnection<true>; - template<bool isSSL> static void addInspector(void* app, JSC::JSGlobalObject* globalObject) { diff --git a/src/bun.js/bindings/bindings.cpp b/src/bun.js/bindings/bindings.cpp index 674957218..ca072f2b1 100644 --- a/src/bun.js/bindings/bindings.cpp +++ b/src/bun.js/bindings/bindings.cpp @@ -55,8 +55,8 @@ #include "JSDOMURL.h" #include <string_view> -#include <uws/src/App.h> -#include <uws/uSockets/src/internal/internal.h> +#include <bun-uws/src/App.h> +#include <bun-usockets/src/internal/internal.h> #include "IDLTypes.h" #include "JSDOMBinding.h" #include "JSDOMConstructor.h" diff --git a/src/deps/libuwsockets.cpp b/src/deps/libuwsockets.cpp index aa4889892..67778c3e3 100644 --- a/src/deps/libuwsockets.cpp +++ b/src/deps/libuwsockets.cpp @@ -1,10 +1,10 @@ #include "_libusockets.h" -#include <uws/src/App.h> -#include <uws/src/AsyncSocket.h> +#include <bun-uws/src/App.h> +#include <bun-uws/src/AsyncSocket.h> +#include <bun-usockets/src/internal/internal.h> #include <string_view> -#include <uws/uSockets/src/internal/internal.h> extern "C" { diff --git a/src/deps/uws b/src/deps/uws deleted file mode 160000 -Subproject 8b4206edb96799df8c5fc01d43a4e5137306416 |