diff src/macgui.h @ 57425:0867872551d9

macterm.c (x_raise_frame): Add BLOCK_INPUT around SelectWindow (x_lower_frame): Add BLOCK_INPUT around SendBehind (make_mac_frame): Add BLOCK_INPUT around the making of a terminal frame (mac_initialize): Add BLOCK_INPUT around carbon initialization macgui.h (mktime): Use emacs_mktime macfns.c (Fx_file_dialog): Add BLOCK_INPUT around more code. Make a cancel file-open dialog be like C-g. mac.c (mktime): Use emacs_mktime (Fdo_applescript): Add BLOCK_INPUT around do_applescript (Fmac_paste_function): Add better error handling for carbon cut/paste
author Steven Tamm <steventamm@mac.com>
date Sun, 10 Oct 2004 16:56:21 +0000
parents f1d6a507dcfd
children 9bde7721ad0f ff0e824afa37
line wrap: on
line diff
--- a/src/macgui.h	Sun Oct 10 14:29:43 2004 +0000
+++ b/src/macgui.h	Sun Oct 10 16:56:21 2004 +0000
@@ -42,6 +42,8 @@
 #undef min
 #undef init_process
 #include <Carbon/Carbon.h>
+#undef mktime
+#define mktime emacs_mktime
 #undef Z
 #define Z (current_buffer->text->z)
 #undef free