File tree Expand file tree Collapse file tree 5 files changed +27
-6
lines changed Expand file tree Collapse file tree 5 files changed +27
-6
lines changed Original file line number Diff line number Diff line change @@ -123,8 +123,6 @@ fn build_jsapi() {
123
123
println ! ( "cargo:rustc-link-lib=psapi" ) ;
124
124
println ! ( "cargo:rustc-link-lib=user32" ) ;
125
125
println ! ( "cargo:rustc-link-lib=Dbghelp" ) ;
126
- println ! ( "cargo:rustc-link-search=native={}/config/external/nspr/pr" , out_dir) ;
127
- println ! ( "cargo:rustc-link-lib=nspr4" ) ;
128
126
if target. contains ( "gnu" ) {
129
127
println ! ( "cargo:rustc-link-lib=stdc++" ) ;
130
128
}
Original file line number Diff line number Diff line change
1
+ diff --git a/mozjs/js/src/vm/PosixNSPR.cpp b/mozjs/js/src/vm/PosixNSPR.cpp
2
+ index 41ce31e488..fdeee75b1b 100644
3
+ --- a/mozjs/js/src/vm/PosixNSPR.cpp
4
+ +++ b/mozjs/js/src/vm/PosixNSPR.cpp
5
+ @@ -11,7 +11,6 @@
6
+ #ifdef JS_POSIX_NSPR
7
+
8
+ # include <errno.h>
9
+ - # include <sys/time.h>
10
+ # include <time.h>
11
+
12
+ int32_t PR_FileDesc2NativeHandle(PRFileDesc *fd) {
13
+ diff --git a/mozjs/js/src/vm/Time.cpp b/mozjs/js/src/vm/Time.cpp
14
+ index e1c810cc29..19ee15009b 100644
15
+ --- a/mozjs/js/src/vm/Time.cpp
16
+ +++ b/mozjs/js/src/vm/Time.cpp
17
+ @@ -27,8 +27,6 @@
18
+ # include <mmsystem.h> /* for timeBegin/EndPeriod */
19
+ # include <stdlib.h> /* for _set_invalid_parameter_handler */
20
+
21
+ - # include "prinit.h"
22
+ -
23
+ #endif
24
+
25
+ #ifdef XP_UNIX
Original file line number Diff line number Diff line change @@ -8,7 +8,8 @@ CONFIGURE_FLAGS := \
8
8
--disable-js-shell \
9
9
--disable-tests \
10
10
--disable-shared-js \
11
- --build-backends=RecursiveMake
11
+ --build-backends=RecursiveMake \
12
+ --enable-posix-nspr-emulation
12
13
13
14
ifeq (windows,$(findstring windows,$(TARGET)))
14
15
WINDOWS := 1
Original file line number Diff line number Diff line change 11
11
#ifdef JS_POSIX_NSPR
12
12
13
13
# include < errno.h>
14
- # include < sys/time.h>
15
14
# include < time.h>
16
15
17
16
int32_t PR_FileDesc2NativeHandle (PRFileDesc *fd) {
Original file line number Diff line number Diff line change 27
27
# include < mmsystem.h> /* for timeBegin/EndPeriod */
28
28
# include < stdlib.h> /* for _set_invalid_parameter_handler */
29
29
30
- # include " prinit.h"
31
-
32
30
#endif
33
31
34
32
#ifdef XP_UNIX
You can’t perform that action at this time.
0 commit comments