(UP, BC, PC): Undo previous change.

diff --git a/src/ChangeLog b/src/ChangeLog
index 804a71f6c5d756e1d1944c2cf88917072ec5a28e..4fd6e1023b03ba40a1338690f78dbb7c74eb610b 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2008-07-22  Dan Nicolaescu  <dann@ics.uci.edu>
 
+       * terminfo.c (UP, BC, PC): Undo previous change.
+       
        * nsfns.m: Rename ns prefixed functions/variables to the
        corresponding x versions.  Update references.
 

diff --git a/src/terminfo.c b/src/terminfo.c
index 968d338279bfebc33f62d24ab450b6fb7890a48f..c1e1a36a83339398cd261aebb482cfba697ef571 100644 (file)
--- a/src/terminfo.c
+++ b/src/terminfo.c
@@ -24,10 +24,7 @@ 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