comparison src/macmenu.c @ 83066:887bb2eb4a89

Merged in changes from CVS HEAD Patches applied: * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-116 Update from CVS * [e-mail]--gnu-2004/emacs--cvs-trunk--0--patch-117 Update from CVS git-archimport-id: [e-mail]--2004/emacs--multi-tty--0--patch-106

83065:a871be7b26a5

#include "blockinput.h"
#include "buffer.h"
#include "charset.h"
#include "coding.h"

#ifdef MAC_OSX
#undef mktime
#undef DEBUG
#undef Z
#undef free
#undef malloc
#undef realloc
/* Macros max and min defined in lisp.h conflict with those in
   precompiled header Carbon.h.  */
#undef max
#undef min
#undef init_process
#include <Carbon/Carbon.h>
#undef Z
#define Z (current_buffer->text->z)
#undef free
#define free unexec_free
#undef malloc
#define malloc unexec_malloc
#undef realloc
#define realloc unexec_realloc
#undef min
#define min(a, b) ((a) < (b) ? (a) : (b))
#undef max
#define max(a, b) ((a) > (b) ? (a) : (b))
#undef init_process
#define init_process emacs_init_process
#else /* not MAC_OSX */
#include <MacTypes.h>
#include <Menus.h>
#include <QuickDraw.h>
#include <ToolUtils.h>
#include <Fonts.h>

83066:887bb2eb4a89

#include "blockinput.h"
#include "buffer.h"
#include "charset.h"
#include "coding.h"

#ifndef MAC_OSX
#include <MacTypes.h>
#include <Menus.h>
#include <QuickDraw.h>
#include <ToolUtils.h>
#include <Fonts.h>