summaryrefslogtreecommitdiff
path: root/src/terminfo.c
diff options
context:
space:
mode:
authorAdrian Robert <Adrian.B.Robert@gmail.com>2008-07-15 18:15:18 +0000
committerAdrian Robert <Adrian.B.Robert@gmail.com>2008-07-15 18:15:18 +0000
commitedfda78355c5528eee489fa8a7f9c73bf8e734f2 (patch)
tree78d2414d9791e1efc17ec9b35b438ae35602340a /src/terminfo.c
parent1391cd548782097e34d7856ec4f20ca90bdf2c26 (diff)
downloademacs-edfda78355c5528eee489fa8a7f9c73bf8e734f2.tar.gz
merging Emacs.app (NeXTstep port)
Diffstat (limited to 'src/terminfo.c')
-rw-r--r--src/terminfo.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/terminfo.c b/src/terminfo.c
index c1e1a36a833..968d338279b 100644
--- a/src/terminfo.c
+++ b/src/terminfo.c
@@ -24,7 +24,10 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
so that we do not need to conditionalize the places in Emacs
that set them. */
+/* Causes a conflict on OS X 10.3 .*/
+#ifndef NS_IMPL_COCOA
char *UP, *BC, PC;
+#endif
/* Interface to curses/terminfo library.
Turns out that all of the terminfo-level routines look