[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/macgui.h
|
From: |
YAMAMOTO Mitsuharu |
|
Subject: |
[Emacs-diffs] Changes to emacs/src/macgui.h |
|
Date: |
Fri, 29 Apr 2005 05:00:45 -0400 |
Index: emacs/src/macgui.h
diff -c emacs/src/macgui.h:1.17 emacs/src/macgui.h:1.18
*** emacs/src/macgui.h:1.17 Tue Apr 19 12:03:38 2005
--- emacs/src/macgui.h Fri Apr 29 09:00:45 2005
***************
*** 32,38 ****
--- 32,40 ----
#ifdef HAVE_CARBON
#undef Z
#ifdef MAC_OSX
+ #if ! HAVE_MKTIME || BROKEN_MKTIME
#undef mktime
+ #endif
#undef DEBUG
#undef free
#undef malloc
***************
*** 43,50 ****
--- 45,54 ----
#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