Merge from emacs-24; up to 2013-01-03T02:37:57Z!rgm@gnu.org

[gnu-emacs] / src / blockinput.h

diff --git a/src/blockinput.h b/src/blockinput.h
index 6dc22c6f5dd90383a5ac1e54aff96687d3a9af38..8f1b1e18985952270862c71fa688e22314007a6a 100644 (file)
--- a/src/blockinput.h
+++ b/src/blockinput.h
@@ -20,9 +20,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #define EMACS_BLOCKINPUT_H
 
 INLINE_HEADER_BEGIN
-#ifndef BLOCKINPUT_INLINE
-# define BLOCKINPUT_INLINE INLINE
-#endif
 
 /* Emacs should avoid doing anything hairy in a signal handler, because
    so many system functions are non-reentrant.  For example, malloc
@@ -52,7 +49,7 @@ extern volatile int interrupt_input_blocked;
 
 /* Begin critical section. */
 
-BLOCKINPUT_INLINE void
+INLINE void
 block_input (void)
 {
   interrupt_input_blocked++;
@@ -64,7 +61,7 @@ extern void unblock_input_to (int);
 
 /* In critical section ? */
 
-BLOCKINPUT_INLINE bool
+INLINE bool
 input_blocked_p (void)
 {
   return interrupt_input_blocked > 0;