Mercurial > emacs
changeset 46778:ab139c5f16b3
2002-07-31 Andrew Choi <akochoi@shaw.ca>
* macfns.c: #undef init_process before #define-ing it.
author | Andrew Choi <akochoi@shaw.ca> |
---|---|
date | Thu, 01 Aug 2002 03:53:04 +0000 |
parents | 19a2158de8ae |
children | 69e4765ff43e |
files | src/ChangeLog src/macfns.c |
diffstat | 2 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Thu Aug 01 03:48:22 2002 +0000 +++ b/src/ChangeLog Thu Aug 01 03:53:04 2002 +0000 @@ -1,5 +1,7 @@ 2002-07-31 Andrew Choi <akochoi@shaw.ca> + * 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.
--- a/src/macfns.c Thu Aug 01 03:48:22 2002 +0000 +++ b/src/macfns.c Thu Aug 01 03:53:04 2002 +0000 @@ -86,7 +86,7 @@ #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 <Windows.h>