xfns.c (Fx_create_frame): If frame height i stoo big, try

[gnu-emacs] / src / blockinput.h

diff --git a/src/blockinput.h b/src/blockinput.h
index a3b50d2a0f26b0c51e95aa1a793bbe1a6742dcb2..890adcbcd862de74f1640c99711db24cc3396f2e 100644 (file)
--- a/src/blockinput.h
+++ b/src/blockinput.h
@@ -1,12 +1,13 @@
 /* blockinput.h - interface to blocking complicated interrupt-driven input.
-   Copyright (C) 1989, 1993, 2004 Free Software Foundation, Inc.
+   Copyright (C) 1989, 1993, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
-GNU Emacs is free software; you can redistribute it and/or modify
+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)
-any later version.
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,9 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #ifndef EMACS_BLOCKINPUT_H
 #define EMACS_BLOCKINPUT_H
@@ -48,7 +47,7 @@ Boston, MA 02111-1307, USA.  */
    interrupt_input_pending to a non-zero value.  If that flag is set
    when input becomes unblocked, UNBLOCK_INPUT will send a new SIGIO.  */
 
-extern int interrupt_input_blocked;
+extern volatile int interrupt_input_blocked;
 
 /* Nonzero means an input interrupt has arrived
    during the current critical section.  */
@@ -60,6 +59,7 @@ extern int interrupt_input_pending;
 
 extern int pending_atimers;
 
+
 /* Begin critical section. */
 #define BLOCK_INPUT (interrupt_input_blocked++)
 
@@ -98,12 +98,12 @@ extern int pending_atimers;
    and also reinvoke any pending signal.  */
 
 #define TOTALLY_UNBLOCK_INPUT                  \
-  if (interrupt_input_blocked != 0)            \
+  do if (interrupt_input_blocked != 0)         \
     {                                          \
       interrupt_input_blocked = 1;             \
       UNBLOCK_INPUT;                           \
     }                                          \
-  else
+  while (0)
 
 /* Undo any number of BLOCK_INPUT calls down to level LEVEL,
    and also (if the level is now 0) reinvoke any pending signal.  */
@@ -111,10 +111,8 @@ extern int pending_atimers;
 #define UNBLOCK_INPUT_TO(LEVEL)                                \
   do                                                   \
     {                                                  \
-      int oldlevel = interrupt_input_blocked;          \
       interrupt_input_blocked = (LEVEL) + 1;           \
-      if (interrupt_input_blocked != oldlevel + 1)     \
-        UNBLOCK_INPUT;                                 \
+      UNBLOCK_INPUT;                                   \
     }                                                  \
   while (0)