Commit 7a92caf8 authored by YAMAMOTO Mitsuharu's avatar YAMAMOTO Mitsuharu
Browse files

[HAVE_CARBON && MAC_OSX]: Don't undefine/define mktime

before/after including Carbon.h if there is a working mktime.
parent 4f19cb15
2005-04-29 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* mac.c: Don't include time.h. Include sysselect.h after
systime.h.
* macfns.c (Fx_server_version): Add BLOCK_INPUT around Gestalt.
* macgui.h [HAVE_CARBON && MAC_OSX]: Don't undefine/define mktime
before/after including Carbon.h if there is a working mktime.
2005-04-28 Kim F. Storm <storm@cua.dk>
 
* xfaces.c (resolve_face_name): Add arg SIGNAL_P. Calls changed.
......@@ -87,7 +97,7 @@
[USE_CARBON_EVENTS && MAC_OSX] (Qpreferences, Qservices, Qpaste)
(Qperform): New variables.
(syms_of_mac) [USE_CARBON_EVENTS && MAC_OSX]: Initialize them.
(do_get_menus) [!TARGET_API_MAC_CARBON]: Don't call AppendResMenu.
(do_get_menus) [TARGET_API_MAC_CARBON]: Don't call AppendResMenu.
(do_menu_choice): Unhighlight menu bar also when menu_id is 0.
(mac_store_application_menu_event, init_menu_bar): New functions.
[USE_CARBON_EVENTS] (mac_handle_command_event)
......
......@@ -32,7 +32,9 @@ typedef unsigned long Time;
#ifdef HAVE_CARBON
#undef Z
#ifdef MAC_OSX
#if ! HAVE_MKTIME || BROKEN_MKTIME
#undef mktime
#endif
#undef DEBUG
#undef free
#undef malloc
......@@ -43,8 +45,10 @@ typedef unsigned long Time;
#undef min
#undef init_process
#include <Carbon/Carbon.h>
#if ! HAVE_MKTIME || BROKEN_MKTIME
#undef mktime
#define mktime emacs_mktime
#endif
#undef free
#define free unexec_free
#undef malloc
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment