From 7a92caf8cef43f7ae3f4912d5d69a5bd1e6c95df Mon Sep 17 00:00:00 2001 From: YAMAMOTO Mitsuharu Date: Fri, 29 Apr 2005 09:00:57 +0000 Subject: [PATCH] [HAVE_CARBON && MAC_OSX]: Don't undefine/define mktime before/after including Carbon.h if there is a working mktime. --- src/ChangeLog | 12 +++++++++++- src/macgui.h | 4 ++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index d2471f41229..da4758f5f49 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,13 @@ +2005-04-29 YAMAMOTO Mitsuharu + + * 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 * 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) diff --git a/src/macgui.h b/src/macgui.h index 5d4f1894e2e..939496aaeef 100644 --- a/src/macgui.h +++ b/src/macgui.h @@ -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 +#if ! HAVE_MKTIME || BROKEN_MKTIME #undef mktime #define mktime emacs_mktime +#endif #undef free #define free unexec_free #undef malloc -- 2.39.2