summaryrefslogtreecommitdiff
path: root/src/blockinput.h
diff options
context:
space:
mode:
authorAdrian Robert <Adrian.B.Robert@gmail.com>2008-07-15 18:15:18 +0000
committerAdrian Robert <Adrian.B.Robert@gmail.com>2008-07-15 18:15:18 +0000
commitedfda78355c5528eee489fa8a7f9c73bf8e734f2 (patch)
tree78d2414d9791e1efc17ec9b35b438ae35602340a /src/blockinput.h
parent1391cd548782097e34d7856ec4f20ca90bdf2c26 (diff)
downloademacs-edfda78355c5528eee489fa8a7f9c73bf8e734f2.tar.gz
merging Emacs.app (NeXTstep port)
Diffstat (limited to 'src/blockinput.h')
-rw-r--r--src/blockinput.h12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/blockinput.h b/src/blockinput.h
index bcf8d17e870..fb338d9df49 100644
--- a/src/blockinput.h
+++ b/src/blockinput.h
@@ -59,6 +59,16 @@ 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++)
@@ -115,6 +125,8 @@ extern int pending_atimers;
} \
while (0)
+#endif /* defined HAVE_NS && !defined COCOA_EXPERIMENTAL_CTRL_G */
+
#define UNBLOCK_INPUT_RESIGNAL UNBLOCK_INPUT
/* In critical section ? */