[Emacs-diffs] Changes to emacs/src/keyboard.c

[Jan Djärv]

Index: emacs/src/keyboard.c
diff -c emacs/src/keyboard.c:1.799 emacs/src/keyboard.c:1.800
*** emacs/src/keyboard.c:1.799  Tue Dec  7 08:25:43 2004
--- emacs/src/keyboard.c        Tue Dec  7 21:03:03 2004
***************
*** 6780,6786 ****
  #ifdef BSD4_1
    extern int select_alarmed;
  #endif
! #ifdef HAVE_GTK_AND_PTHREAD
    extern pthread_t main_thread;
    if (pthread_self () != main_thread)
      {
--- 6780,6786 ----
  #ifdef BSD4_1
    extern int select_alarmed;
  #endif
! #if ! defined (SYSTEM_MALLOC) && defined (HAVE_GTK_AND_PTHREAD)
    extern pthread_t main_thread;
    if (pthread_self () != main_thread)
      {
***************
*** 6826,6832 ****
  {
    /* Must preserve main program's value of errno.  */
    int old_errno = errno;
! #ifdef HAVE_GTK_AND_PTHREAD
    extern pthread_t main_thread;
    if (pthread_self () != main_thread)
      {
--- 6826,6832 ----
  {
    /* Must preserve main program's value of errno.  */
    int old_errno = errno;
! #if ! defined (SYSTEM_MALLOC) && defined (HAVE_GTK_AND_PTHREAD)
    extern pthread_t main_thread;
    if (pthread_self () != main_thread)
      {