Mercurial > emacs

diff src/terminfo.c @ 96675:d45acf0c8d23

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merging Emacs.app (NeXTstep port)
author Adrian Robert <Adrian.B.Robert@gmail.com>
date Tue, 15 Jul 2008 18:15:18 +0000
parents 8971ddf55736
children f802294e840d
line wrap: on
line diff
--- a/src/terminfo.c	Tue Jul 15 15:45:05 2008 +0000
+++ b/src/terminfo.c	Tue Jul 15 18:15:18 2008 +0000
@@ -24,7 +24,10 @@
    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