Mercurial > emacs

diff src/macgui.h @ 83296:effe22690419

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged from miles@gnu.org--gnu-2005 (patch 281-285) Patches applied: * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-281 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-282 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-283 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-284 Update from CVS * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-285 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-336
author Karoly Lorentey <lorentey@elte.hu>
date Mon, 02 May 2005 14:38:00 +0000
parents 89f644173276
children a8fa7c632ee4 08185296b491
line wrap: on
line diff
--- a/src/macgui.h	Tue Apr 26 12:17:42 2005 +0000
+++ b/src/macgui.h	Mon May 02 14:38:00 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