# HG changeset patch
# User Dan Nicolaescu <dann@ics.uci.edu>
# Date 1216749456 0
# Node ID f802294e840d4561f85faefc86e7f271e10e015a
# Parent  d3f5f5665a508db695947ee1343b06cf6efff826
(UP, BC, PC): Undo previous change.

diff -r d3f5f5665a50 -r f802294e840d src/ChangeLog
--- a/src/ChangeLog	Tue Jul 22 17:43:36 2008 +0000
+++ b/src/ChangeLog	Tue Jul 22 17:57:36 2008 +0000
@@ -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 -r d3f5f5665a50 -r f802294e840d src/terminfo.c
--- a/src/terminfo.c	Tue Jul 22 17:43:36 2008 +0000
+++ b/src/terminfo.c	Tue Jul 22 17:57:36 2008 +0000
@@ -24,10 +24,7 @@
    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