From: Dan Nicolaescu <dann@ics.uci.edu>
Date: Tue, 22 Jul 2008 17:57:36 +0000 (+0000)
Subject: (UP, BC, PC): Undo previous change.
X-Git-Tag: emacs-pretest-23.0.90~3989
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0ecc3474743ee4c25cbcfb24ea3acb0f8b424206;p=emacs.git

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

diff --git a/src/ChangeLog b/src/ChangeLog
index 804a71f6c5d..4fd6e1023b0 100644
--- 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 968d338279b..c1e1a36a833 100644
--- 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