Fix previous ChangeLog date fix (no need to merge to trunk)

[gnu-emacs] / src / tparam.c

diff --git a/src/tparam.c b/src/tparam.c
index e593589d5cbb2e68393591a9f4ad9721023e0466..dcf79a3b61714f2d7c173bf8851500998c437af2 100644 (file)
--- a/src/tparam.c
+++ b/src/tparam.c
@@ -1,6 +1,6 @@
 /* Merge parameters into a termcap entry string.
-   Copyright (C) 1985, 1987, 1993, 1995, 2000, 2002, 2003, 2004,
-                 2005 Free Software Foundation, Inc.
+   Copyright (C) 1985, 1987, 1993, 1995, 2000, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -23,6 +23,7 @@ Boston, MA 02110-1301, USA.  */
 #endif
 
 #ifdef emacs
+#include <setjmp.h>
 #include "lisp.h"              /* for xmalloc */
 #else
 
@@ -108,9 +109,6 @@ tparam (string, outstring, len, arg0, arg1, arg2, arg3)
   return tparam1 (string, outstring, len, NULL, NULL, arg);
 }
 
-/* These are already defined in the System framework in Mac OS X and
-   cause prebinding to fail.  */
-#ifndef MAC_OSX
 char *BC;
 char *UP;
 
@@ -128,7 +126,6 @@ tgoto (cm, hpos, vpos)
   args[1] = hpos;
   return tparam1 (cm, tgoto_buf, 50, UP, BC, args);
 }
-#endif
 
 static char *
 tparam1 (string, outstring, len, up, left, argp)