Merge from emacs--devo--0

[gnu-emacs] / src / syssignal.h

diff --git a/src/syssignal.h b/src/syssignal.h
index 36292670bc6f69b8b609e3528a37d842885d6f6d..72ac1ed7f62ab3df54eb1b8b36af7c227f1ffb68 100644 (file)
--- a/src/syssignal.h
+++ b/src/syssignal.h
@@ -6,7 +6,7 @@ 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,
@@ -33,6 +33,7 @@ extern pthread_t main_thread;
    indicate that SIGIO doesn't work by #undef-ing SIGIO.  If this file
    #includes <signal.h>, then that will re-#define SIGIO and confuse
    things.  */
+/* XXX This is not correct anymore, there is a BROKEN_SIGIO macro. */
 
 #define SIGMASKTYPE sigset_t