Skip to content

Commit 89cfa86

Browse files
committed
Merge remote-tracking branch 'origin/thread-safe' into no-MACOSX_DEPLOYMENT_TARGET
2 parents 2f1faac + 9b67784 commit 89cfa86

3 files changed

Lines changed: 130 additions & 61 deletions

File tree

package-lock.json

Lines changed: 126 additions & 53 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
"gypfile": true,
5656
"dependencies": {
5757
"bindings": "^1.5.0",
58-
"node-addon-api": "^4.2.0"
58+
"node-addon-api": "^4.3.0"
5959
},
6060
"devDependencies": {
6161
"@types/mocha": "^9.0.0",
@@ -71,9 +71,9 @@
7171
"mocha": "^9.1.3",
7272
"node-gyp": "^8.4.1",
7373
"nyc": "^15.1.0",
74-
"prettier": "^2.5.1",
74+
"prettier": "^2.6.0",
7575
"should": "^13.2.3",
76-
"ts-node": "^10.4.0",
77-
"typescript": "^4.5.4"
76+
"ts-node": "^10.7.0",
77+
"typescript": "^4.6.2"
7878
}
7979
}

src/Gids.cc

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,7 @@
1010
#if !defined(_WIN32)
1111
#include <grp.h>
1212
#include <pwd.h>
13-
14-
// BSD needs unistd.h for getgrouplist function
15-
#if defined(BSD) || defined(__APPLE__)
1613
#include <unistd.h>
17-
#endif
1814

1915
#else
2016
#include "lib/WindowsMocks.hh"

0 commit comments

Comments
 (0)