diff options
| author | Tino Calancha | 2016-12-10 23:04:12 +0900 |
|---|---|---|
| committer | Tino Calancha | 2016-12-10 23:04:12 +0900 |
| commit | ae31a7fac5c1cb8d5d3cb3238d15a5e3b791fd69 (patch) | |
| tree | 2dd1b0284abcc06c0d80500d6d8e86505ec05130 /src/lisp.h | |
| parent | afd162d0d782a4889e0c99dc3458a66e36da7cd4 (diff) | |
| parent | 828b4560cd4a0d8cb9b7a7a3e20ff0c53ba86cfa (diff) | |
| download | emacs-test-concurrency.tar.gz emacs-test-concurrency.zip | |
Merge with remote reptest-concurrency
Diffstat (limited to 'src/lisp.h')
| -rw-r--r-- | src/lisp.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lisp.h b/src/lisp.h index 72ea50d5f27..3c7c3dde904 100644 --- a/src/lisp.h +++ b/src/lisp.h | |||
| @@ -845,6 +845,7 @@ enum pvec_type | |||
| 845 | PVEC_THREAD, | 845 | PVEC_THREAD, |
| 846 | PVEC_MUTEX, | 846 | PVEC_MUTEX, |
| 847 | PVEC_CONDVAR, | 847 | PVEC_CONDVAR, |
| 848 | |||
| 848 | /* These should be last, check internal_equal to see why. */ | 849 | /* These should be last, check internal_equal to see why. */ |
| 849 | PVEC_COMPILED, | 850 | PVEC_COMPILED, |
| 850 | PVEC_CHAR_TABLE, | 851 | PVEC_CHAR_TABLE, |
| @@ -3229,6 +3230,7 @@ union specbinding | |||
| 3229 | } bt; | 3230 | } bt; |
| 3230 | }; | 3231 | }; |
| 3231 | 3232 | ||
| 3233 | /* These 3 are defined as macros in thread.h. */ | ||
| 3232 | /* extern union specbinding *specpdl; */ | 3234 | /* extern union specbinding *specpdl; */ |
| 3233 | /* extern union specbinding *specpdl_ptr; */ | 3235 | /* extern union specbinding *specpdl_ptr; */ |
| 3234 | /* extern ptrdiff_t specpdl_size; */ | 3236 | /* extern ptrdiff_t specpdl_size; */ |