[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/emacs.c,v
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/src/emacs.c,v |
Date: |
Wed, 14 May 2008 04:28:54 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Miles Bader <miles> 08/05/14 04:28:52
Index: src/emacs.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/emacs.c,v
retrieving revision 1.422
retrieving revision 1.423
diff -u -b -r1.422 -r1.423
--- src/emacs.c 14 May 2008 01:24:12 -0000 1.422
+++ src/emacs.c 14 May 2008 04:28:45 -0000 1.423
@@ -355,10 +355,10 @@
void (*fatal_error_signal_hook) P_ ((void));
-#ifdef HAVE_GTK_AND_PTHREAD
-/* When compiled with GTK and running under Gnome, multiple threads may be
- created. Keep track of our main thread to make sure signals are delivered
- to it (see syssignal.h). */
+#ifdef FORWARD_SIGNAL_TO_MAIN_THREAD
+/* When compiled with GTK and running under Gnome, or Carbon under Mac
+ OS X, multiple threads may be created. Keep track of our main
+ thread to make sure signals are delivered to it (see syssignal.h). */
pthread_t main_thread;
#endif
@@ -1035,9 +1035,9 @@
# endif /* not SYNC_INPUT */
#endif /* not SYSTEM_MALLOC */
-#ifdef HAVE_GTK_AND_PTHREAD
+#ifdef FORWARD_SIGNAL_TO_MAIN_THREAD
main_thread = pthread_self ();
-#endif /* HAVE_GTK_AND_PTHREAD */
+#endif /* FORWARD_SIGNAL_TO_MAIN_THREAD */
#if defined (MSDOS) || defined (WINDOWSNT)
/* We do all file input/output as binary files. When we need to translate
- [Emacs-diffs] Changes to emacs/src/emacs.c,v, Kenichi Handa, 2008/05/13
- [Emacs-diffs] Changes to emacs/src/emacs.c,v,
Miles Bader <=
- [Emacs-diffs] Changes to emacs/src/emacs.c,v, Glenn Morris, 2008/05/14
- [Emacs-diffs] Changes to emacs/src/emacs.c,v, Glenn Morris, 2008/05/14
- [Emacs-diffs] Changes to emacs/src/emacs.c,v, Kenichi Handa, 2008/05/20
- [Emacs-diffs] Changes to emacs/src/emacs.c,v, Stefan Monnier, 2008/05/21