merge from trunk

this merges frmo trunk and fixes various build issues.
this needed a few ugly tweaks.
this hangs in "make check" now

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.  */