diff options
| author | YAMAMOTO Mitsuharu | 2005-04-29 09:00:57 +0000 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu | 2005-04-29 09:00:57 +0000 |
| commit | 7a92caf8cef43f7ae3f4912d5d69a5bd1e6c95df (patch) | |
| tree | cf5d1ed1a4460f8ef6e8857bc840110fbf7332b2 /src/macgui.h | |
| parent | 4f19cb1521ff3c2c50820d91c00dea6d2af48954 (diff) | |
| download | emacs-7a92caf8cef43f7ae3f4912d5d69a5bd1e6c95df.tar.gz emacs-7a92caf8cef43f7ae3f4912d5d69a5bd1e6c95df.zip | |
[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; | |||
| 32 | #ifdef HAVE_CARBON | 32 | #ifdef HAVE_CARBON |
| 33 | #undef Z | 33 | #undef Z |
| 34 | #ifdef MAC_OSX | 34 | #ifdef MAC_OSX |
| 35 | #if ! HAVE_MKTIME || BROKEN_MKTIME | ||
| 35 | #undef mktime | 36 | #undef mktime |
| 37 | #endif | ||
| 36 | #undef DEBUG | 38 | #undef DEBUG |
| 37 | #undef free | 39 | #undef free |
| 38 | #undef malloc | 40 | #undef malloc |
| @@ -43,8 +45,10 @@ typedef unsigned long Time; | |||
| 43 | #undef min | 45 | #undef min |
| 44 | #undef init_process | 46 | #undef init_process |
| 45 | #include <Carbon/Carbon.h> | 47 | #include <Carbon/Carbon.h> |
| 48 | #if ! HAVE_MKTIME || BROKEN_MKTIME | ||
| 46 | #undef mktime | 49 | #undef mktime |
| 47 | #define mktime emacs_mktime | 50 | #define mktime emacs_mktime |
| 51 | #endif | ||
| 48 | #undef free | 52 | #undef free |
| 49 | #define free unexec_free | 53 | #define free unexec_free |
| 50 | #undef malloc | 54 | #undef malloc |