Merge from emacs-23; up to 2010-06-12T10:58:54Z!romain@orebokech.com.

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

diff --git a/src/s/netbsd.h b/src/s/netbsd.h
index 115779a7cbcd994585b3824395b3d5d55f666a27..52cda717a2d4c43dfabe3d8a05d46794649bae93 100644 (file)
--- a/src/s/netbsd.h
+++ b/src/s/netbsd.h
@@ -1,7 +1,6 @@
 /* s/ file for netbsd system.
 
-   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007,
-                 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
+Copyright (C) 2001-2011  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -22,8 +21,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Get most of the stuff from bsd-common.  */
 #include "bsd-common.h"
 
-#define HAVE_GETLOADAVG 1
-
 #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
 
 #define DEFAULT_SOUND_DEVICE "/dev/audio"
@@ -44,6 +41,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method.  */
 #define GC_MARK_STACK  GC_MAKE_GCPROS_NOOPS
-
-/* arch-tag: e80f364a-04e9-4faf-93cb-f36a0fe95c81
-   (do not change this comment) */