Switch license to GPLv3 or later.

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

diff --git a/src/s/gnu.h b/src/s/gnu.h
index bc2c1fc..4d54883 100644 (file)
--- a/src/s/gnu.h
+++ b/src/s/gnu.h
@@ -1,11 +1,12 @@
 /* Definitions file for GNU Emacs running on the GNU Hurd.
 /* Definitions file for GNU Emacs running on the GNU Hurd.

-   Copyright (C) 1994, 1995, 1996 Free Software Foundation, Inc.
+   Copyright (C) 1994, 1995, 1996, 2001, 2002, 2003, 2004,
+                 2005, 2006, 2007  Free Software Foundation, Inc.

 
 This file is part of GNU Emacs.
 
 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
 
 This file is part of GNU Emacs.
 
 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)
+the Free Software Foundation; either version 3, or (at your option)

 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,


@@ -15,8 +16,8 @@ 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
 
 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.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */

 
 
 /* Get most of the stuff from bsd4.3 */
 
 
 /* Get most of the stuff from bsd4.3 */


@@ -60,6 +61,11 @@ Boston, MA 02111-1307, USA.  */
 #undef BSD_PGRPS
 #define GETPGRP_NO_ARG
 
 #undef BSD_PGRPS
 #define GETPGRP_NO_ARG
 

+/* Use mmap directly for allocating larger buffers.  */
+#ifdef DOUG_LEA_MALLOC
+#undef REL_ALLOC
+#endif
+

 #define HAVE_WAIT_HEADER
 #define WAIT_USE_INT
 #define HAVE_UNION_WAIT
 #define HAVE_WAIT_HEADER
 #define WAIT_USE_INT
 #define HAVE_UNION_WAIT


@@ -87,3 +93,6 @@ Boston, MA 02111-1307, USA.  */
   ((FILE)->_IO_write_ptr - (FILE)->_IO_write_base)
 #endif /* !_IO_STDIO_H */
 #endif /* emacs */
   ((FILE)->_IO_write_ptr - (FILE)->_IO_write_base)
 #endif /* !_IO_STDIO_H */
 #endif /* emacs */

+
+/* arch-tag: 577983d9-87a6-4922-b8f8-ff2b563714a4
+   (do not change this comment) */