diff options
author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2005-04-29 09:00:45 +0000 |
---|---|---|
committer | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2005-04-29 09:00:45 +0000 |
commit | af56b998d9cab580fbf2b4513013a6bbe0945275 (patch) | |
tree | 317c9f41b7c3ca9fdad68713b6fc7bf40b96115b /src/macgui.h | |
parent | 41203115a4168d16bd9798ab301cbb0702dd9026 (diff) | |
download | emacs-af56b998d9cab580fbf2b4513013a6bbe0945275.tar.gz |
[HAVE_CARBON && MAC_OSX]: Don't undefine/define mktime
before/after including Carbon.h if there is a working mktime.
Diffstat (limited to 'src/macgui.h')
-rw-r--r-- | src/macgui.h | 4 |
1 files changed, 4 insertions, 0 deletions
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 <Carbon/Carbon.h> +#if ! HAVE_MKTIME || BROKEN_MKTIME #undef mktime #define mktime emacs_mktime +#endif #undef free #define free unexec_free #undef malloc |