Mercurial > emacs

changeset 61927:89f644173276

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[HAVE_CARBON && MAC_OSX]: Don't undefine/define mktime before/after including Carbon.h if there is a working mktime.
author YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
date Fri, 29 Apr 2005 09:00:45 +0000
parents e1eca57a26b4
children f8663844e321
files src/macgui.h
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/macgui.h	Fri Apr 29 09:00:22 2005 +0000
+++ b/src/macgui.h	Fri Apr 29 09:00:45 2005 +0000
@@ -32,7 +32,9 @@
 #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 @@
 #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