diff options
| author | Andrew Choi | 2002-08-01 03:53:04 +0000 |
|---|---|---|
| committer | Andrew Choi | 2002-08-01 03:53:04 +0000 |
| commit | 41428ec477116f69da48f345f74d9ea1b66ce67a (patch) | |
| tree | 8988ef2d80fe723ba7f77dddcb403812b9766548 /src | |
| parent | 747642c5ff51c29affab1e885516980f7b41db33 (diff) | |
| download | emacs-41428ec477116f69da48f345f74d9ea1b66ce67a.tar.gz emacs-41428ec477116f69da48f345f74d9ea1b66ce67a.zip | |
2002-07-31 Andrew Choi <akochoi@shaw.ca>
* macfns.c: #undef init_process before #define-ing it.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/macfns.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 2ec775cda16..e4b840064fe 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2002-07-31 Andrew Choi <akochoi@shaw.ca> | 1 | 2002-07-31 Andrew Choi <akochoi@shaw.ca> |
| 2 | 2 | ||
| 3 | * macfns.c: #undef init_process before #define-ing it. | ||
| 4 | |||
| 3 | * s/darwin.h: Define MAC_OS, SYMS_SYSTEM, and OTHER_FILES only if | 5 | * s/darwin.h: Define MAC_OS, SYMS_SYSTEM, and OTHER_FILES only if |
| 4 | HAVE_CARBON is defined. | 6 | HAVE_CARBON is defined. |
| 5 | 7 | ||
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[] = { | |||
| 86 | #define min(a, b) ((a) < (b) ? (a) : (b)) | 86 | #define min(a, b) ((a) < (b) ? (a) : (b)) |
| 87 | #undef max | 87 | #undef max |
| 88 | #define max(a, b) ((a) > (b) ? (a) : (b)) | 88 | #define max(a, b) ((a) > (b) ? (a) : (b)) |
| 89 | #undef | 89 | #undef init_process |
| 90 | #define init_process emacs_init_process | 90 | #define init_process emacs_init_process |
| 91 | #else /* not MAC_OSX */ | 91 | #else /* not MAC_OSX */ |
| 92 | #include <Windows.h> | 92 | #include <Windows.h> |