diff options
Diffstat (limited to 'src/thread.h')
| -rw-r--r-- | src/thread.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/thread.h b/src/thread.h index c10e5ecb758..8ecb00824df 100644 --- a/src/thread.h +++ b/src/thread.h | |||
| @@ -19,7 +19,7 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */ | |||
| 19 | #ifndef THREAD_H | 19 | #ifndef THREAD_H |
| 20 | #define THREAD_H | 20 | #define THREAD_H |
| 21 | 21 | ||
| 22 | #include "regex.h" | 22 | #include "regex-emacs.h" |
| 23 | 23 | ||
| 24 | #ifdef WINDOWSNT | 24 | #ifdef WINDOWSNT |
| 25 | #include <sys/socket.h> | 25 | #include <sys/socket.h> |
| @@ -52,6 +52,9 @@ struct thread_state | |||
| 52 | /* The thread's function. */ | 52 | /* The thread's function. */ |
| 53 | Lisp_Object function; | 53 | Lisp_Object function; |
| 54 | 54 | ||
| 55 | /* The thread's result, if function has finished. */ | ||
| 56 | Lisp_Object result; | ||
| 57 | |||
| 55 | /* If non-nil, this thread has been signaled. */ | 58 | /* If non-nil, this thread has been signaled. */ |
| 56 | Lisp_Object error_symbol; | 59 | Lisp_Object error_symbol; |
| 57 | Lisp_Object error_data; | 60 | Lisp_Object error_data; |
| @@ -109,8 +112,8 @@ struct thread_state | |||
| 109 | struct buffer *m_current_buffer; | 112 | struct buffer *m_current_buffer; |
| 110 | #define current_buffer (current_thread->m_current_buffer) | 113 | #define current_buffer (current_thread->m_current_buffer) |
| 111 | 114 | ||
| 112 | /* Every call to re_match, etc., must pass &search_regs as the regs | 115 | /* Every call to re_match_2, etc., must pass &search_regs as the regs |
| 113 | argument unless you can show it is unnecessary (i.e., if re_match | 116 | argument unless you can show it is unnecessary (i.e., if re_match_2 |
| 114 | is certainly going to be called again before region-around-match | 117 | is certainly going to be called again before region-around-match |
| 115 | can be called). | 118 | can be called). |
| 116 | 119 | ||