Skip to content

src: define NAPI_HAS_THREADS to make TSFN available on Emscripten #1283

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
toyobayashi wants to merge 5 commits into from
Closed

src: define NAPI_HAS_THREADS to make TSFN available on Emscripten #1283

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
92d27b8
src: define `NAPI_HAS_THREADS`
toyobayashi Feb 8, 2023
106abfa
src: run clang-format
toyobayashi Feb 8, 2023
69300c3
src: scope `<mutex>` in `NAPI_HAS_THREADS`
toyobayashi Feb 11, 2023
fd8e9f7
src: do not scope
toyobayashi Feb 13, 2023
f5ad5ac
src: add comment after endif
toyobayashi Feb 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
src: run clang-format
  • Loading branch information
@toyobayashi
toyobayashi committed Feb 8, 2023
commit 106abfad867b5434037dfebb0cbc59e141d4c336
2 changes: 1 addition & 1 deletion napi-inl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4913,7 +4913,7 @@ inline void AsyncWorker::OnWorkComplete(Napi::Env /*env*/, napi_status status) {
}
}

#endif // NAPI_HAS_THREADS
#endif // NAPI_HAS_THREADS

#if (NAPI_VERSION > 3 && NAPI_HAS_THREADS)
////////////////////////////////////////////////////////////////////////////////
Expand Down
5 changes: 3 additions & 2 deletions napi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
#define SRC_NAPI_H_

#ifndef NAPI_HAS_THREADS
#if !defined(__wasm__) || (defined(__EMSCRIPTEN_PTHREADS__) || (defined(__wasi__) && defined(_REENTRANT)))
#if !defined(__wasm__) || (defined(__EMSCRIPTEN_PTHREADS__) || \
(defined(__wasi__) && defined(_REENTRANT)))
#define NAPI_HAS_THREADS 1
#else
#define NAPI_HAS_THREADS 0
Expand Down Expand Up @@ -2508,7 +2509,7 @@ class AsyncWorker {
std::string _error;
bool _suppress_destruct;
};
#endif // NAPI_HAS_THREADS
#endif // NAPI_HAS_THREADS

#if (NAPI_VERSION > 3 && NAPI_HAS_THREADS)
class ThreadSafeFunction {
Expand Down