diff options
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 5d4f1894e2..939496aaee 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 |