*** empty log message ***

[gnu-emacs] / src / s / gnu.h

diff --git a/src/s/gnu.h b/src/s/gnu.h
index d59da8a8b054bd595ddd7812eb945206763a2ec4..0da816c32d33e32b32d8da9647611d0efc17c0b3 100644 (file)
--- a/src/s/gnu.h
+++ b/src/s/gnu.h
@@ -1,5 +1,6 @@
 /* Definitions file for GNU Emacs running on the GNU Hurd.
-   Copyright (C) 1994, 1995 Free Software Foundation, Inc.
+   Copyright (C) 1994, 1995, 1996, 2002, 2003, 2004,
+                 2005 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -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
-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 */
@@ -28,8 +29,13 @@ Boston, MA 02111-1307, USA.  */
 #undef SYSTEM_TYPE
 #define SYSTEM_TYPE "gnu"
 
+#undef NLIST_STRUCT
+
 /* XXX should getloadavg be in libc?  Should we have a libutil?
 #define HAVE_GETLOADAVG */
+#undef NLIST_STRUCT
+#undef KERNEL_FILE
+#undef LDAV_SYMBOL
 
 #define SIGNALS_VIA_CHARACTERS
 
@@ -42,6 +48,12 @@ Boston, MA 02111-1307, USA.  */
 #define TABDLY OXTABS
 #define TAB3 OXTABS
 
+/* Tell Emacs that we are a terminfo based system; disable the use
+   of local termcap.  (GNU uses ncurses.) */
+#ifdef HAVE_LIBNCURSES
+#define TERMINFO
+#define LIBS_TERMCAP -lncurses
+#endif
 
 #define SYSV_SYSTEM_DIR
 
@@ -49,6 +61,11 @@ Boston, MA 02111-1307, USA.  */
 #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
@@ -60,11 +77,22 @@ Boston, MA 02111-1307, USA.  */
 /* GNU now always uses the ELF format.  */
 #define UNEXEC unexelf.o
 
-/* ptys are not done yet.  */
-#undef HAVE_PTYS
-
 /* Some losing code fails to include this and then assumes
    that because it is braindead that O_RDONLY==0.  */
 #ifndef NOT_C_CODE
 #include <fcntl.h>
 #endif
+
+#define NARROWPROTO 1
+
+#ifdef emacs
+#include <stdio.h>  /* Get the definition of _IO_STDIO_H.  */
+#if defined(_IO_STDIO_H) || defined(_STDIO_USES_IOSTREAM)
+/* new C libio names */
+#define GNU_LIBRARY_PENDING_OUTPUT_COUNT(FILE) \
+  ((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) */