From: Andrew Choi Date: Thu, 1 Aug 2002 03:53:04 +0000 (+0000) Subject: 2002-07-31 Andrew Choi X-Git-Tag: ttn-vms-21-2-B4~13788 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=41428ec477116f69da48f345f74d9ea1b66ce67a;p=emacs.git 2002-07-31 Andrew Choi * macfns.c: #undef init_process before #define-ing it. --- diff --git a/src/ChangeLog b/src/ChangeLog index 2ec775cda16..e4b840064fe 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2002-07-31 Andrew Choi + * macfns.c: #undef init_process before #define-ing it. + * s/darwin.h: Define MAC_OS, SYMS_SYSTEM, and OTHER_FILES only if HAVE_CARBON is defined. diff --git a/src/macfns.c b/src/macfns.c index 2b3ed8ae977..d37beb9d158 100644 --- a/src/macfns.c +++ b/src/macfns.c @@ -86,7 +86,7 @@ static unsigned char gray_bits[] = { #define min(a, b) ((a) < (b) ? (a) : (b)) #undef max #define max(a, b) ((a) > (b) ? (a) : (b)) -#undef +#undef init_process #define init_process emacs_init_process #else /* not MAC_OSX */ #include