Merge from emacs--devo--0

[gnu-emacs] / src / syssignal.h

diff --git a/src/syssignal.h b/src/syssignal.h
index 3cb28220962975040cfcb6202d550846b5cf1805..72ac1ed7f62ab3df54eb1b8b36af7c227f1ffb68 100644 (file)
--- a/src/syssignal.h
+++ b/src/syssignal.h
@@ -1,12 +1,12 @@
 /* syssignal.h - System-dependent definitions for signals.
-   Copyright (C) 1993, 1999, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+   Copyright (C) 1993, 1999, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
@@ -211,7 +211,7 @@ char *strsignal ();
 #ifdef HAVE_GTK_AND_PTHREAD
 #define SIGNAL_THREAD_CHECK(signo)                                      \
   do {                                                                  \
-    if (pthread_self () != main_thread)                                 \
+    if (!pthread_equal (pthread_self (), main_thread))                 \
       {                                                                 \
         /* POSIX says any thread can receive the signal.  On GNU/Linux  \
            that is not true, but for other systems (FreeBSD at least)   \