diff options
| author | Andrew Choi <akochoi@shaw.ca> | 2002-04-26 23:39:06 +0000 |
|---|---|---|
| committer | Andrew Choi <akochoi@shaw.ca> | 2002-04-26 23:39:06 +0000 |
| commit | e0f712ba55fa0d073f6ab93606e428f61fc7caf2 (patch) | |
| tree | 7dc6d3403fafcbee1a83288ac840f7eba1d92b44 /src/tparam.c | |
| parent | 501d8923ae2cdec4ef50f050bb66d3715ba2a8f6 (diff) | |
| download | emacs-e0f712ba55fa0d073f6ab93606e428f61fc7caf2.tar.gz emacs-e0f712ba55fa0d073f6ab93606e428f61fc7caf2.tar.bz2 emacs-e0f712ba55fa0d073f6ab93606e428f61fc7caf2.zip | |
Patch for building Emacs on Mac OS X. April 26, 2002. See ChangeLog,
lisp/ChangeLog, and src/ChangeLog for list of changes.
Diffstat (limited to 'src/tparam.c')
| -rw-r--r-- | src/tparam.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/tparam.c b/src/tparam.c index 5a9809aab47..844e5f6f175 100644 --- a/src/tparam.c +++ b/src/tparam.c @@ -107,6 +107,9 @@ tparam (string, outstring, len, arg0, arg1, arg2, arg3) return tparam1 (string, outstring, len, NULL, NULL, arg); } +/* These are already defined in the System framework in Mac OS X and + cause prebinding to fail. */ +#ifndef MAC_OSX char *BC; char *UP; @@ -124,6 +127,7 @@ tgoto (cm, hpos, vpos) args[1] = hpos; return tparam1 (cm, tgoto_buf, 50, UP, BC, args); } +#endif static char * tparam1 (string, outstring, len, up, left, argp) |