(terminal-composition-base-character-p): New

[bpt/emacs.git] / src / s / nextstep.h

diff --git a/src/s/nextstep.h b/src/s/nextstep.h
index 6cb6f7a..03b5d86 100644 (file)
--- a/src/s/nextstep.h
+++ b/src/s/nextstep.h
@@ -1,12 +1,13 @@
 /* Configuration file for the NeXTstep system.
-   Copyright (C) 1990, 1995 Free Software Foundation, Inc.
+   Copyright (C) 1990, 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+                 2008  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
-GNU Emacs is free software; you can redistribute it and/or modify
+GNU Emacs is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,9 +15,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "bsd4-3.h"
 
@@ -43,8 +42,6 @@ Boston, MA 02111-1307, USA.  */
    stupidly gets confused by it.  */
 #undef KERNEL_FILE
 
-#define HAVE_ALLOCA
-
 #define SYSTEM_MALLOC
 
 #define environ _environ
@@ -106,3 +103,12 @@ Boston, MA 02111-1307, USA.  */
 #define TEXT_END get_etext ()
 /* This seems to be right for end_of_data, but it may not be used anyway.  */
 #define DATA_END get_edata ()
+
+/* Don't include string.h--it causes trouble.  */
+#undef HAVE_STRING_H
+
+/* Tell emacs.c not to define abort.  */
+#define NO_ABORT
+
+/* arch-tag: 5cd6fed4-a0be-4402-9349-85a80bc01d57
+   (do not change this comment) */