Merge from emacs-24; up to 2012-04-26T03:04:36Z!cyd@gnu.org

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

diff --git a/src/s/freebsd.h b/src/s/freebsd.h
index cfed343..05be076 100644 (file)
--- a/src/s/freebsd.h
+++ b/src/s/freebsd.h
@@ -1,8 +1,6 @@
 /* System description header for FreeBSD systems.
 
-Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-  2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-  Free Software Foundation, Inc.
+Copyright (C) 1994-2012  Free Software Foundation, Inc.
 
 Author: Shawn M. Carey
 (according to authors.el)
@@ -27,8 +25,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base)
 
-#define HAVE_GETLOADAVG 1
-
 /* This silences a few compilation warnings.  */
 #undef BSD_SYSTEM
 #if __FreeBSD__ == 1
@@ -62,9 +58,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Tell that garbage collector that setjmp is known to save all
    registers relevant for conservative garbage collection in the jmp_buf.  */
 #define GC_SETJMP_WORKS 1
-
-/* Use the GC_MAKE_GCPROS_NOOPS (see lisp.h) method for marking the stack.  */
-#define GC_MARK_STACK  GC_MAKE_GCPROS_NOOPS
-
-/* arch-tag: 426529ca-b7c4-448f-b10a-d4dcdc9c78eb
-   (do not change this comment) */