Merge from emacs-23 branch.

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

diff --git a/src/s/hpux10-20.h b/src/s/hpux10-20.h
index d34ff16104b0ee6c7d940e7417be57c9cecfbbac..3e88b57bc910c6b36a1471f5305f3694e650fd0b 100644 (file)
--- a/src/s/hpux10-20.h
+++ b/src/s/hpux10-20.h
@@ -1,7 +1,6 @@
 /* System description file for hpux version 10.20.
-
-Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-  2009, 2010  Free Software Foundation, Inc.
+   Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
+     2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -35,11 +34,8 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    if system supports pty's.  'p' means it is /dev/ptym/ptyp0  */
 #define FIRST_PTY_LETTER 'p'
 
-#define HAVE_TERMIOS
 #define NO_TERMIO
 
-#define ORDINARY_LINK
-
 /* Define HAVE_PTYS if the system supports pty devices.  */
 #define HAVE_PTYS
 
@@ -78,9 +74,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    HP-UX 10.20, and that it works for HP-UX 0 as well.  */
 #define NO_EDITRES
 
-/* Tested in getloadavg.c.  */
-#define HAVE_PSTAT_GETDYNAMIC
-
 /* Eric Backus <ericb@lsid.hp.com> says, HP-UX 9.x on HP 700 machines
    has a broken `rint' in some library versions including math library
    version number A.09.05.