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 fb338d9df4985968a193c0463a53963439092e91..890adcbcd862de74f1640c99711db24cc3396f2e 100644 (file)
--- a/src/blockinput.h
+++ b/src/blockinput.h
@@ -1,6 +1,6 @@
 /* blockinput.h - interface to blocking complicated interrupt-driven input.
    Copyright (C) 1989, 1993, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+                 2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -59,15 +59,6 @@ extern int interrupt_input_pending;
 
 extern int pending_atimers;
 
-#if defined HAVE_NS && !defined COCOA_EXPERIMENTAL_CTRL_G
-/* NS does not use interrupt-driven input processing (yet), so this is
-   unneeded and moreover was causing problems. */
-#define BLOCK_INPUT
-#define UNBLOCK_INPUT
-#define TOTALLY_UNBLOCK_INPUT
-#define UNBLOCK_INPUT_TO(LEVEL)
-
-#else
 
 /* Begin critical section. */
 #define BLOCK_INPUT (interrupt_input_blocked++)
@@ -125,8 +116,6 @@ extern int pending_atimers;
     }                                                  \
   while (0)
 
-#endif /* defined HAVE_NS && !defined COCOA_EXPERIMENTAL_CTRL_G */
-
 #define UNBLOCK_INPUT_RESIGNAL UNBLOCK_INPUT
 
 /* In critical section ? */