# HG changeset patch # User Andrew Choi # Date 1028173984 0 # Node ID ab139c5f16b3d8265035224bc6f60598479c636e # Parent 19a2158de8aea4fbe2eaed9248e709f701e76704 2002-07-31 Andrew Choi * macfns.c: #undef init_process before #define-ing it. diff -r 19a2158de8ae -r ab139c5f16b3 src/ChangeLog --- 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 + * 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 -r 19a2158de8ae -r ab139c5f16b3 src/macfns.c --- 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