diff options
| author | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2005-04-29 09:00:57 +0000 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 2005-04-29 09:00:57 +0000 |
| commit | 7a92caf8cef43f7ae3f4912d5d69a5bd1e6c95df (patch) | |
| tree | cf5d1ed1a4460f8ef6e8857bc840110fbf7332b2 /src/macgui.h | |
| parent | 4f19cb1521ff3c2c50820d91c00dea6d2af48954 (diff) | |
| download | emacs-7a92caf8cef43f7ae3f4912d5d69a5bd1e6c95df.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 |