diff options
| author | Tom Tromey <tromey@redhat.com> | 2013-07-06 23:18:58 -0600 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2013-07-06 23:18:58 -0600 |
| commit | 6dacdad5fcb278e5a16b38bb81786aac9ca27be4 (patch) | |
| tree | f5f331ea361ba0f99e0f9b638d183ad492a7da31 /src/thread.h | |
| parent | 0a6f2ff0c8ceb29703e76cddd46ea3f176dd873a (diff) | |
| parent | 219afb88d9d484393418820d1c08dc93299110ec (diff) | |
| download | emacs-6dacdad5fcb278e5a16b38bb81786aac9ca27be4.tar.gz | |
merge from trunk
this merges frmo trunk and fixes various build issues.
this needed a few ugly tweaks.
this hangs in "make check" now
Diffstat (limited to 'src/thread.h')
| -rw-r--r-- | src/thread.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/thread.h b/src/thread.h index e43b0a335aa..e77d1144ecf 100644 --- a/src/thread.h +++ b/src/thread.h @@ -92,11 +92,11 @@ struct thread_state #define specpdl_size (current_thread->m_specpdl_size) /* Pointer to beginning of specpdl. */ - struct specbinding *m_specpdl; + union specbinding *m_specpdl; #define specpdl (current_thread->m_specpdl) /* Pointer to first unused element in specpdl. */ - struct specbinding *m_specpdl_ptr; + union specbinding *m_specpdl_ptr; #define specpdl_ptr (current_thread->m_specpdl_ptr) /* Depth in Lisp evaluations and function calls. */ |